@assistant-ui/core 0.3.12 → 0.3.13

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

@@ -3,8 +3,8 @@ import { getThreadMessageText } from "../../utils/text.js";
 import { toMessagePartStatus } from "../../utils/normalizePartStatus.js";
 import { resolveToolApprovalResponse } from "../../runtime/utils/resolveToolApprovalResponse.js";
 import { isCreateAttachment } from "../../types/attachment.js";
+import { ThreadSuggestions } from "./suggestions.js";
 import { ModelContext } from "./model-context-client.js";
-import { Suggestions } from "./suggestions.js";
 import { DataRenderers } from "../../react/client/DataRenderers.js";
 import { Tools } from "../../react/client/Tools.js";
 import { SingleThreadList } from "./single-thread-list.js";
@@ -16,6 +16,7 @@ import { Derived, attachTransformScopes, useClientLookup, useClientResource } fr
 //#region src/store/clients/external-thread.ts
 const EMPTY_QUEUE_ITEMS = [];
 const EMPTY_BRANCH_IDS = [];
+const EMPTY_SUGGESTIONS = [];
 const COMPLETE_STATUS = Object.freeze({ type: "complete" });
 const derivePartStatus = (message, partIndex, part) => {
 	if (!message.status) return COMPLETE_STATUS;
@@ -352,6 +353,39 @@ const useAttachmentResource = ({ attachment, onRemove }) => {
 	};
 };
 const AttachmentResource = resource(useAttachmentResource);
+var AttachmentAddOperations = class {
+	operations = /* @__PURE__ */ new Set();
+	start() {
+		const operation = {
+			cancelled: false,
+			attachmentIds: /* @__PURE__ */ new Set()
+		};
+		this.operations.add(operation);
+		return operation;
+	}
+	accept(operation, attachmentId) {
+		if (operation.cancelled) return false;
+		operation.attachmentIds.add(attachmentId);
+		return true;
+	}
+	finish(operation) {
+		this.operations.delete(operation);
+	}
+	isCancelled(operation) {
+		return operation.cancelled;
+	}
+	cancel(attachmentId) {
+		for (const operation of [...this.operations]) {
+			if (!operation.attachmentIds.has(attachmentId)) continue;
+			operation.cancelled = true;
+			this.operations.delete(operation);
+		}
+	}
+	cancelAll() {
+		for (const operation of this.operations) operation.cancelled = true;
+		this.operations.clear();
+	}
+};
 const useQueueItemClient = ({ item, onMove, onRemove }) => {
 	return {
 		getState: () => item,
@@ -365,8 +399,9 @@ const useQueueItemClient = ({ item, onMove, onRemove }) => {
 };
 const QueueItemClient = resource(useQueueItemClient);
 const drainAdapterAdd = async (result, upsert) => {
-	if (Symbol.asyncIterator in result) for await (const attachment of result) upsert(attachment);
-	else upsert(await result);
+	if (Symbol.asyncIterator in result) {
+		for await (const attachment of result) if (!upsert(attachment)) break;
+	} else upsert(await result);
 };
 const useLiveState = (initial) => {
 	const $ = c(3);
@@ -394,76 +429,84 @@ const useLiveState = (initial) => {
 	return t1;
 };
 const useComposerClientResource = (t0) => {
-	const $ = c(104);
-	const { type, canCancel, isSendDisabled: t1, onCancel, onBeginEdit, onSend, message, queue, attachmentAdapter } = t0;
-	const isSendDisabled = t1 === void 0 ? false : t1;
+	const $ = c(105);
+	const { type, canCancel, isRunning: t1, isSendDisabled: t2, onCancel, onBeginEdit, onSend, message, queue, attachmentAdapter } = t0;
+	const isRunning = t1 === void 0 ? false : t1;
+	const isSendDisabled = t2 === void 0 ? false : t2;
 	const [isEditing, setIsEditing, isEditingRef] = useLiveState(type === "thread");
 	const [text, setText, textRef] = useLiveState("");
 	const [role, setRole, roleRef] = useLiveState("user");
-	let t2;
-	if ($[0] === Symbol.for("react.memo_cache_sentinel")) {
-		t2 = {};
-		$[0] = t2;
-	} else t2 = $[0];
-	const [runConfig, setRunConfig, runConfigRef] = useLiveState(t2);
 	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 ($[1] === Symbol.for("react.memo_cache_sentinel")) {
-		t3 = [];
-		$[1] = t3;
-	} else t3 = $[1];
-	const [attachments, setAttachments, attachmentsRef] = useLiveState(t3);
+		t4 = [];
+		$[1] = t4;
+	} else t4 = $[1];
+	const [attachments, setAttachments, attachmentsRef] = useLiveState(t4);
 	const [quote, setQuote, quoteRef] = useLiveState(void 0);
-	let t4;
-	if ($[2] !== message || $[3] !== setAttachments || $[4] !== setRole || $[5] !== setText) {
-		t4 = () => {
+	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 (!message) return;
 			const messageText = message.content.filter(_temp4).map(_temp5).join("\n\n");
 			setText(messageText);
 			setRole(message.role);
 			setAttachments(message.attachments ?? []);
 		};
-		$[2] = message;
-		$[3] = setAttachments;
-		$[4] = setRole;
-		$[5] = setText;
-		$[6] = t4;
-	} else t4 = $[6];
-	const updateFromMessage = t4;
-	let t5;
-	if ($[7] !== attachmentAdapter || $[8] !== attachments || $[9] !== setAttachments) {
-		let t6;
-		if ($[11] !== attachmentAdapter || $[12] !== setAttachments) {
-			t6 = (attachment) => withKey(attachment.id, AttachmentResource({
+		$[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);
 					await attachmentAdapter?.remove(attachment);
 					setAttachments((prev) => prev.filter((a) => a.id !== attachment.id));
 				}
 			}));
-			$[11] = attachmentAdapter;
-			$[12] = setAttachments;
-			$[13] = t6;
-		} else t6 = $[13];
-		t5 = attachments.map(t6);
-		$[7] = attachmentAdapter;
-		$[8] = attachments;
-		$[9] = setAttachments;
-		$[10] = t5;
-	} else t5 = $[10];
-	const attachmentClients = useClientLookup(t5);
-	let t6;
-	if ($[14] !== attachmentAdapter) {
-		t6 = async (removed) => {
+			$[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) => {
 			if (!attachmentAdapter) return;
 			await Promise.all(removed.filter(_temp6).map((a_1) => attachmentAdapter.remove(a_1)));
 		};
-		$[14] = attachmentAdapter;
-		$[15] = t6;
-	} else t6 = $[15];
-	const removePendingAttachments = t6;
-	let t7;
-	if ($[16] !== setAttachments) {
-		t7 = (attachment_0) => {
+		$[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];
@@ -472,41 +515,41 @@ const useComposerClientResource = (t0) => {
 				return next;
 			});
 		};
-		$[16] = setAttachments;
-		$[17] = t7;
-	} else t7 = $[17];
-	const upsertAttachment = t7;
+		$[17] = setAttachments;
+		$[18] = t9;
+	} else t9 = $[18];
+	const upsertAttachment = t9;
 	const steerItems = queue?.steerItems ?? EMPTY_QUEUE_ITEMS;
 	const laneItems = queue?.items ?? EMPTY_QUEUE_ITEMS;
-	let t8;
-	if ($[18] !== laneItems || $[19] !== steerItems) {
-		t8 = steerItems.length === 0 ? laneItems : laneItems.length === 0 ? steerItems : [...steerItems, ...laneItems];
-		$[18] = laneItems;
-		$[19] = steerItems;
-		$[20] = t8;
-	} else t8 = $[20];
-	const queueItems = t8;
-	let t9;
-	if ($[21] !== queue || $[22] !== queueItems) {
-		let t10;
-		if ($[24] !== queue) {
-			t10 = (item) => withKey(item.id, QueueItemClient({
+	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({
 				item,
 				onMove: (placement) => queue?.move(item.id, placement),
 				onRemove: () => queue?.remove(item.id)
 			}));
-			$[24] = queue;
-			$[25] = t10;
-		} else t10 = $[25];
-		t9 = queueItems.map(t10);
-		$[21] = queue;
-		$[22] = queueItems;
-		$[23] = t9;
-	} else t9 = $[23];
-	const queueItemClients = useClientLookup(t9);
-	let t10;
-	if ($[26] !== attachmentAdapter?.accept || $[27] !== attachmentClients.state || $[28] !== attachments.length || $[29] !== canCancel || $[30] !== isEditing || $[31] !== isSendDisabled || $[32] !== queueItems || $[33] !== quote || $[34] !== role || $[35] !== runConfig || $[36] !== text || $[37] !== type) {
-		t10 = () => {
+			$[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 = () => {
 			const isEmpty = !text.trim() && !attachments.length;
 			return {
 				text,
@@ -524,37 +567,37 @@ const useComposerClientResource = (t0) => {
 				queue: queueItems
 			};
 		};
-		$[26] = attachmentAdapter?.accept;
-		$[27] = attachmentClients.state;
-		$[28] = attachments.length;
-		$[29] = canCancel;
-		$[30] = isEditing;
-		$[31] = isSendDisabled;
-		$[32] = queueItems;
-		$[33] = quote;
-		$[34] = role;
-		$[35] = runConfig;
-		$[36] = text;
-		$[37] = type;
-		$[38] = t10;
-	} else t10 = $[38];
+		$[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];
 	attachmentAdapter?.accept;
-	let t11;
-	if ($[39] !== t10) {
-		t11 = t10();
-		$[39] = t10;
-		$[40] = t11;
-	} else t11 = $[40];
-	const state = t11;
-	let t12;
-	if ($[41] !== state) {
-		t12 = () => state;
-		$[41] = state;
-		$[42] = t12;
-	} else t12 = $[42];
 	let t13;
-	if ($[43] !== attachmentAdapter || $[44] !== setAttachments || $[45] !== upsertAttachment) {
-		t13 = async (fileOrAttachment) => {
+	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) => {
 			if (attachmentAdapter) {
 				const file = isCreateAttachment(fileOrAttachment) ? {
 					name: fileOrAttachment.name,
@@ -565,8 +608,21 @@ const useComposerClientResource = (t0) => {
 				};
 				if (!fileMatchesAccept(file, attachmentAdapter.accept)) throw new Error(`File type ${file.type || "unknown"} is not accepted. Accepted types: ${attachmentAdapter.accept}`);
 			}
-			if (!isCreateAttachment(fileOrAttachment) && attachmentAdapter) await drainAdapterAdd(attachmentAdapter.add({ file: fileOrAttachment }), upsertAttachment);
-			else if (!isCreateAttachment(fileOrAttachment)) {
+			if (!isCreateAttachment(fileOrAttachment) && attachmentAdapter) {
+				const operation = attachmentAddOperations.start();
+				try {
+					await drainAdapterAdd(attachmentAdapter.add({ file: fileOrAttachment }), (attachment_1) => {
+						if (!attachmentAddOperations.accept(operation, attachment_1.id)) return false;
+						upsertAttachment(attachment_1);
+						return true;
+					});
+					attachmentAddOperations.finish(operation);
+				} catch (t16) {
+					const error = t16;
+					attachmentAddOperations.finish(operation);
+					if (!attachmentAddOperations.isCancelled(operation)) throw error;
+				}
+			} else if (!isCreateAttachment(fileOrAttachment)) {
 				const newAttachment = {
 					id: Math.random().toString(36).substring(7),
 					type: "file",
@@ -589,35 +645,37 @@ const useComposerClientResource = (t0) => {
 				setAttachments((prev_2) => [...prev_2, newAttachment_0]);
 			}
 		};
-		$[43] = attachmentAdapter;
-		$[44] = setAttachments;
-		$[45] = upsertAttachment;
-		$[46] = t13;
-	} else t13 = $[46];
-	let t14;
-	if ($[47] !== attachmentsRef || $[48] !== removePendingAttachments || $[49] !== setAttachments) {
-		t14 = async () => {
+		$[44] = attachmentAdapter;
+		$[45] = setAttachments;
+		$[46] = upsertAttachment;
+		$[47] = t15;
+	} else t15 = $[47];
+	let t16;
+	if ($[48] !== attachmentsRef || $[49] !== removePendingAttachments || $[50] !== setAttachments) {
+		t16 = async () => {
+			attachmentAddOperations.cancelAll();
 			const removed_0 = attachmentsRef.current;
 			setAttachments([]);
 			await removePendingAttachments(removed_0);
 		};
-		$[47] = attachmentsRef;
-		$[48] = removePendingAttachments;
-		$[49] = setAttachments;
-		$[50] = t14;
-	} else t14 = $[50];
-	let t15;
-	if ($[51] !== attachmentClients) {
-		t15 = (selector) => {
+		$[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 });
 			return attachmentClients.get(selector);
 		};
-		$[51] = attachmentClients;
-		$[52] = t15;
-	} else t15 = $[52];
-	let t16;
-	if ($[53] !== attachmentsRef || $[54] !== removePendingAttachments || $[55] !== setAttachments || $[56] !== setQuote || $[57] !== setRole || $[58] !== setRunConfig || $[59] !== setText) {
-		t16 = async () => {
+		$[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 () => {
+			attachmentAddOperations.cancelAll();
 			const removed_1 = attachmentsRef.current;
 			setText("");
 			setRole("user");
@@ -626,30 +684,33 @@ const useComposerClientResource = (t0) => {
 			setQuote(void 0);
 			await removePendingAttachments(removed_1);
 		};
-		$[53] = attachmentsRef;
-		$[54] = removePendingAttachments;
-		$[55] = setAttachments;
-		$[56] = setQuote;
-		$[57] = setRole;
-		$[58] = setRunConfig;
-		$[59] = setText;
-		$[60] = t16;
-	} else t16 = $[60];
-	let t17;
-	if ($[61] !== attachmentAdapter || $[62] !== attachmentsRef || $[63] !== canCancel || $[64] !== isEditingRef || $[65] !== isSendDisabled || $[66] !== onSend || $[67] !== queue || $[68] !== quoteRef || $[69] !== roleRef || $[70] !== runConfigRef || $[71] !== setAttachments || $[72] !== setIsEditing || $[73] !== setQuote || $[74] !== setText || $[75] !== textRef || $[76] !== type) {
-		t17 = (opts) => {
+		$[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;
 			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: roleRef.current,
+					role: currentRole,
 					content: currentText ? [{
 						type: "text",
 						text: currentText
@@ -658,113 +719,113 @@ const useComposerClientResource = (t0) => {
 					createdAt: /* @__PURE__ */ new Date(),
 					parentId: null,
 					sourceId: null,
-					runConfig: runConfigRef.current,
+					runConfig: currentRunConfig,
 					startRun: opts?.startRun,
 					metadata: { custom: { ...currentQuote ? { quote: currentQuote } : {} } }
 				};
 				if (queue && type === "thread") {
-					if (opts?.steer ?? canCancel) queue.steer(composedMessage);
+					if (opts?.steer ?? isRunning) queue.steer(composedMessage);
 					else queue.enqueue(composedMessage);
 				} else onSend?.(composedMessage);
 				if (type === "edit") setIsEditing(false);
 			};
-			if (attachmentAdapter && currentAttachments.length > 0) Promise.all(currentAttachments.map((attachment_1) => attachment_1.status.type === "complete" ? attachment_1 : attachmentAdapter.send(attachment_1))).then(dispatch, (error) => {
+			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);
+				console.error("Failed to send attachments", error_0);
 			});
 			else dispatch(currentAttachments);
 		};
-		$[61] = attachmentAdapter;
-		$[62] = attachmentsRef;
-		$[63] = canCancel;
+		$[62] = attachmentAdapter;
+		$[63] = attachmentsRef;
 		$[64] = isEditingRef;
-		$[65] = isSendDisabled;
-		$[66] = onSend;
-		$[67] = queue;
-		$[68] = quoteRef;
-		$[69] = roleRef;
-		$[70] = runConfigRef;
-		$[71] = setAttachments;
-		$[72] = setIsEditing;
-		$[73] = setQuote;
-		$[74] = setText;
-		$[75] = textRef;
-		$[76] = type;
-		$[77] = t17;
-	} else t17 = $[77];
-	let t18;
-	if ($[78] !== onCancel || $[79] !== setIsEditing || $[80] !== type) {
-		t18 = () => {
+		$[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] !== onCancel || $[80] !== setIsEditing || $[81] !== type) {
+		t20 = () => {
 			onCancel?.();
 			if (type === "edit") setIsEditing(false);
 		};
-		$[78] = onCancel;
-		$[79] = setIsEditing;
-		$[80] = type;
-		$[81] = t18;
-	} else t18 = $[81];
-	let t19;
-	if ($[82] !== isEditingRef || $[83] !== onBeginEdit || $[84] !== setIsEditing || $[85] !== type || $[86] !== updateFromMessage) {
-		t19 = () => {
+		$[79] = onCancel;
+		$[80] = setIsEditing;
+		$[81] = type;
+		$[82] = t20;
+	} else t20 = $[82];
+	let t21;
+	if ($[83] !== isEditingRef || $[84] !== onBeginEdit || $[85] !== setIsEditing || $[86] !== type || $[87] !== updateFromMessage) {
+		t21 = () => {
 			onBeginEdit?.();
 			if (type === "thread") return;
 			if (isEditingRef.current) throw new Error("Edit already in progress");
 			setIsEditing(true);
 			updateFromMessage();
 		};
-		$[82] = isEditingRef;
-		$[83] = onBeginEdit;
-		$[84] = setIsEditing;
-		$[85] = type;
-		$[86] = updateFromMessage;
-		$[87] = t19;
-	} else t19 = $[87];
-	let t20;
-	if ($[88] !== queueItemClients) {
-		t20 = (selector_0) => {
+		$[83] = isEditingRef;
+		$[84] = onBeginEdit;
+		$[85] = setIsEditing;
+		$[86] = type;
+		$[87] = updateFromMessage;
+		$[88] = t21;
+	} else t21 = $[88];
+	let t22;
+	if ($[89] !== queueItemClients) {
+		t22 = (selector_0) => {
 			if ("id" in selector_0) return queueItemClients.get({ key: selector_0.id });
 			return queueItemClients.get(selector_0);
 		};
-		$[88] = queueItemClients;
-		$[89] = t20;
-	} else t20 = $[89];
-	let t21;
-	if ($[90] !== setQuote || $[91] !== setRole || $[92] !== setRunConfig || $[93] !== setText || $[94] !== t12 || $[95] !== t13 || $[96] !== t14 || $[97] !== t15 || $[98] !== t16 || $[99] !== t17 || $[100] !== t18 || $[101] !== t19 || $[102] !== t20) {
-		t21 = {
-			getState: t12,
+		$[89] = queueItemClients;
+		$[90] = t22;
+	} else t22 = $[90];
+	let t23;
+	if ($[91] !== setQuote || $[92] !== setRole || $[93] !== setRunConfig || $[94] !== setText || $[95] !== t14 || $[96] !== t15 || $[97] !== t16 || $[98] !== t17 || $[99] !== t18 || $[100] !== t19 || $[101] !== t20 || $[102] !== t21 || $[103] !== t22) {
+		t23 = {
+			getState: t14,
 			setText,
 			setRole,
 			setRunConfig,
-			addAttachment: t13,
-			clearAttachments: t14,
-			attachment: t15,
-			reset: t16,
-			send: t17,
-			cancel: t18,
-			beginEdit: t19,
+			addAttachment: t15,
+			clearAttachments: t16,
+			attachment: t17,
+			reset: t18,
+			send: t19,
+			cancel: t20,
+			beginEdit: t21,
 			startDictation: _temp7,
 			stopDictation: _temp8,
 			setQuote,
-			queueItem: t20
+			queueItem: t22
 		};
-		$[90] = setQuote;
-		$[91] = setRole;
-		$[92] = setRunConfig;
-		$[93] = setText;
-		$[94] = t12;
-		$[95] = t13;
-		$[96] = t14;
-		$[97] = t15;
-		$[98] = t16;
-		$[99] = t17;
-		$[100] = t18;
-		$[101] = t19;
-		$[102] = t20;
-		$[103] = t21;
-	} else t21 = $[103];
-	return t21;
+		$[91] = setQuote;
+		$[92] = setRole;
+		$[93] = setRunConfig;
+		$[94] = setText;
+		$[95] = t14;
+		$[96] = t15;
+		$[97] = t16;
+		$[98] = t17;
+		$[99] = t18;
+		$[100] = t19;
+		$[101] = t20;
+		$[102] = t21;
+		$[103] = t22;
+		$[104] = t23;
+	} else t23 = $[104];
+	return t23;
 };
 const ComposerClientResource = resource(useComposerClientResource);
 const createSpeechController = (notify) => {
@@ -833,8 +894,8 @@ const dedupeMessagesById = (messages) => {
 	return deduped.length === messages.length ? messages : deduped.reverse();
 };
 const useExternalThread = (t0) => {
-	const $ = c(106);
-	const { messages: messagesProp, isRunning: t1, isLoading: t2, state: threadState, extras, isSendDisabled: t3, onNew, onEdit, onReload, onStartRun, onCancel, onResume, onAddToolResult, onResumeToolCall, onLoadExternalState, attachmentAdapter, feedbackAdapter, speechAdapter, queue, branches, onRespondToToolApproval } = t0;
+	const $ = c(115);
+	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 isRunning = t1 === void 0 ? false : t1;
 	const isLoading = t2 === void 0 ? false : t2;
 	const isSendDisabled = t3 === void 0 ? false : t3;
@@ -1007,36 +1068,41 @@ const useExternalThread = (t0) => {
 	} else t17 = $[38];
 	const messageClients = useClientLookup(t17);
 	let t18;
-	if ($[39] !== onCancel) {
+	if ($[39] !== onCancel || $[40] !== queue) {
 		t18 = () => {
-			onCancel?.();
+			if (!onCancel) return;
+			queue?.__internal_notifyCancelled?.();
+			onCancel();
 		};
 		$[39] = onCancel;
-		$[40] = t18;
-	} else t18 = $[40];
+		$[40] = queue;
+		$[41] = t18;
+	} else t18 = $[41];
 	const handleCancelRun = t18;
 	let t19;
-	if ($[41] !== messages || $[42] !== onNew) {
+	if ($[42] !== messages || $[43] !== onNew) {
 		t19 = (message_1) => {
 			onNew?.({
 				...message_1,
 				parentId: messages.at(-1)?.id ?? null
 			});
 		};
-		$[41] = messages;
-		$[42] = onNew;
-		$[43] = t19;
-	} else t19 = $[43];
+		$[42] = messages;
+		$[43] = onNew;
+		$[44] = t19;
+	} else t19 = $[44];
 	const handleSendNew = t19;
 	let t20;
-	if ($[44] !== messages) {
+	if ($[45] !== messages) {
 		t20 = messages.at(-1)?.id ?? null;
-		$[44] = messages;
-		$[45] = t20;
-	} else t20 = $[45];
+		$[45] = messages;
+		$[46] = t20;
+	} else t20 = $[46];
 	const headId = t20;
+	const hasCancel = !!onCancel;
+	const hasRefetchThread = !!onRefetchThread;
 	let t21;
-	if ($[46] !== headId || $[47] !== queue) {
+	if ($[47] !== headId || $[48] !== queue) {
 		t21 = queue && {
 			...queue,
 			enqueue: (message_2) => queue.enqueue({
@@ -1048,31 +1114,40 @@ const useExternalThread = (t0) => {
 				parentId: message_3.parentId ?? headId
 			})
 		};
-		$[46] = headId;
-		$[47] = queue;
-		$[48] = t21;
-	} else t21 = $[48];
+		$[47] = headId;
+		$[48] = queue;
+		$[49] = t21;
+	} else t21 = $[49];
 	const composerQueue = t21;
-	let t22;
-	if ($[49] !== attachmentAdapter || $[50] !== composerQueue || $[51] !== handleCancelRun || $[52] !== handleSendNew || $[53] !== isRunning || $[54] !== isSendDisabled) {
-		t22 = ComposerClientResource({
+	const t22 = isRunning && hasCancel;
+	let t23;
+	if ($[50] !== attachmentAdapter || $[51] !== composerQueue || $[52] !== handleCancelRun || $[53] !== handleSendNew || $[54] !== isRunning || $[55] !== isSendDisabled || $[56] !== t22) {
+		t23 = ComposerClientResource({
 			type: "thread",
-			canCancel: isRunning,
+			canCancel: t22,
+			isRunning,
 			isSendDisabled,
 			onCancel: handleCancelRun,
 			onSend: handleSendNew,
 			queue: composerQueue,
 			attachmentAdapter
 		});
-		$[49] = attachmentAdapter;
-		$[50] = composerQueue;
-		$[51] = handleCancelRun;
-		$[52] = handleSendNew;
-		$[53] = isRunning;
-		$[54] = isSendDisabled;
-		$[55] = t22;
-	} else t22 = $[55];
-	const composerClient = useClientResource(t22);
+		$[50] = attachmentAdapter;
+		$[51] = composerQueue;
+		$[52] = handleCancelRun;
+		$[53] = handleSendNew;
+		$[54] = isRunning;
+		$[55] = isSendDisabled;
+		$[56] = t22;
+		$[57] = t23;
+	} else t23 = $[57];
+	const composerClient = useClientResource(t23);
+	let t24;
+	if ($[58] === Symbol.for("react.memo_cache_sentinel")) {
+		t24 = ThreadSuggestions(EMPTY_SUGGESTIONS);
+		$[58] = t24;
+	} else t24 = $[58];
+	const suggestionsClient = useClientResource(t24);
 	const hasQueue = !!queue;
 	const hasBranches = !!branches;
 	const hasEdit = !!onEdit;
@@ -1080,22 +1155,22 @@ const useExternalThread = (t0) => {
 	const hasAttachments = !!attachmentAdapter;
 	const hasFeedback = !!feedbackAdapter;
 	const hasSpeech = !!speechAdapter;
-	let t23;
-	if ($[56] !== messageClients.state) {
-		t23 = messageClients.state.map(_temp9);
-		$[56] = messageClients.state;
-		$[57] = t23;
-	} else t23 = $[57];
-	const messageStates = t23;
-	const t24 = messages.length === 0;
 	let t25;
-	if ($[58] !== hasAttachments || $[59] !== hasBranches || $[60] !== hasEdit || $[61] !== hasFeedback || $[62] !== hasQueue || $[63] !== hasReload || $[64] !== hasSpeech || $[65] !== isRunning) {
-		t25 = {
+	if ($[59] !== messageClients.state) {
+		t25 = messageClients.state.map(_temp9);
+		$[59] = messageClients.state;
+		$[60] = t25;
+	} else t25 = $[60];
+	const messageStates = t25;
+	const t26 = messages.length === 0;
+	let t27;
+	if ($[61] !== hasAttachments || $[62] !== hasBranches || $[63] !== hasCancel || $[64] !== hasEdit || $[65] !== hasFeedback || $[66] !== hasQueue || $[67] !== hasRefetchThread || $[68] !== hasReload || $[69] !== hasSpeech) {
+		t27 = {
 			edit: hasEdit,
 			delete: false,
 			reload: hasReload,
-			refetchThread: false,
-			cancel: isRunning,
+			refetchThread: hasRefetchThread,
+			cancel: hasCancel,
 			speech: hasSpeech,
 			attachments: hasAttachments,
 			feedback: hasFeedback,
@@ -1106,70 +1181,72 @@ const useExternalThread = (t0) => {
 			dictation: false,
 			queue: hasQueue
 		};
-		$[58] = hasAttachments;
-		$[59] = hasBranches;
-		$[60] = hasEdit;
-		$[61] = hasFeedback;
-		$[62] = hasQueue;
-		$[63] = hasReload;
-		$[64] = hasSpeech;
-		$[65] = isRunning;
-		$[66] = t25;
-	} else t25 = $[66];
-	let t26;
-	if ($[67] !== threadState) {
-		t26 = threadState ?? {};
-		$[67] = threadState;
-		$[68] = t26;
-	} else t26 = $[68];
-	let t27;
-	if ($[69] === Symbol.for("react.memo_cache_sentinel")) {
-		t27 = [];
-		$[69] = t27;
-	} else t27 = $[69];
+		$[61] = hasAttachments;
+		$[62] = hasBranches;
+		$[63] = hasCancel;
+		$[64] = hasEdit;
+		$[65] = hasFeedback;
+		$[66] = hasQueue;
+		$[67] = hasRefetchThread;
+		$[68] = hasReload;
+		$[69] = hasSpeech;
+		$[70] = t27;
+	} else t27 = $[70];
 	let t28;
-	if ($[70] !== composerClient.state || $[71] !== extras || $[72] !== isLoading || $[73] !== isRunning || $[74] !== messageStates || $[75] !== speech || $[76] !== t24 || $[77] !== t25 || $[78] !== t26) {
-		t28 = {
-			isEmpty: t24,
+	if ($[71] !== threadState) {
+		t28 = threadState ?? {};
+		$[71] = threadState;
+		$[72] = t28;
+	} else t28 = $[72];
+	let t29;
+	if ($[73] !== composerClient.state || $[74] !== extras || $[75] !== isLoading || $[76] !== isRunning || $[77] !== messageStates || $[78] !== speech || $[79] !== t26 || $[80] !== t27 || $[81] !== t28) {
+		t29 = {
+			isEmpty: t26,
 			isDisabled: false,
 			isLoading,
 			isRunning,
-			capabilities: t25,
+			capabilities: t27,
 			messages: messageStates,
-			state: t26,
-			suggestions: t27,
+			state: t28,
+			suggestions: EMPTY_SUGGESTIONS,
 			extras,
 			speech,
 			voice: void 0,
 			composer: composerClient.state
 		};
-		$[70] = composerClient.state;
-		$[71] = extras;
-		$[72] = isLoading;
-		$[73] = isRunning;
-		$[74] = messageStates;
-		$[75] = speech;
-		$[76] = t24;
-		$[77] = t25;
-		$[78] = t26;
-		$[79] = t28;
-	} else t28 = $[79];
-	const state = t28;
-	let t29;
-	if ($[80] !== state) {
-		t29 = () => state;
-		$[80] = state;
-		$[81] = t29;
-	} else t29 = $[81];
+		$[73] = composerClient.state;
+		$[74] = extras;
+		$[75] = isLoading;
+		$[76] = isRunning;
+		$[77] = messageStates;
+		$[78] = speech;
+		$[79] = t26;
+		$[80] = t27;
+		$[81] = t28;
+		$[82] = t29;
+	} else t29 = $[82];
+	const state = t29;
 	let t30;
-	if ($[82] !== composerClient.methods) {
-		t30 = () => composerClient.methods;
-		$[82] = composerClient.methods;
-		$[83] = t30;
-	} else t30 = $[83];
+	if ($[83] !== state) {
+		t30 = () => state;
+		$[83] = state;
+		$[84] = t30;
+	} else t30 = $[84];
 	let t31;
-	if ($[84] !== messages || $[85] !== onNew || $[86] !== queue) {
-		t31 = (message_4) => {
+	if ($[85] !== composerClient.methods) {
+		t31 = () => composerClient.methods;
+		$[85] = composerClient.methods;
+		$[86] = t31;
+	} else t31 = $[86];
+	let t32;
+	if ($[87] !== suggestionsClient) {
+		t32 = () => suggestionsClient.methods;
+		$[87] = suggestionsClient;
+		$[88] = t32;
+	} else t32 = $[88];
+	let t33;
+	if ($[89] !== messages || $[90] !== onNew || $[91] !== queue) {
+		t33 = (message_4) => {
 			const appendMessage = typeof message_4 === "string" ? {
 				createdAt: /* @__PURE__ */ new Date(),
 				parentId: messages.at(-1)?.id ?? null,
@@ -1196,62 +1273,70 @@ const useExternalThread = (t0) => {
 			if (queue) queue.enqueue(appendMessage);
 			else onNew?.(appendMessage);
 		};
-		$[84] = messages;
-		$[85] = onNew;
-		$[86] = queue;
-		$[87] = t31;
-	} else t31 = $[87];
-	let t32;
-	if ($[88] !== onStartRun) {
-		t32 = () => {
+		$[89] = messages;
+		$[90] = onNew;
+		$[91] = queue;
+		$[92] = t33;
+	} else t33 = $[92];
+	let t34;
+	if ($[93] !== onStartRun) {
+		t34 = () => {
 			onStartRun?.();
 		};
-		$[88] = onStartRun;
-		$[89] = t32;
-	} else t32 = $[89];
-	let t33;
-	if ($[90] !== onResume) {
-		t33 = () => {
+		$[93] = onStartRun;
+		$[94] = t34;
+	} else t34 = $[94];
+	let t35;
+	if ($[95] !== onResume) {
+		t35 = () => {
 			if (!onResume) throw new Error("Runtime does not support resuming runs (onResume is not set).");
 			onResume();
 		};
-		$[90] = onResume;
-		$[91] = t33;
-	} else t33 = $[91];
-	let t34;
-	if ($[92] !== onLoadExternalState) {
-		t34 = (state_0) => {
+		$[95] = onResume;
+		$[96] = t35;
+	} else t35 = $[96];
+	let t36;
+	if ($[97] !== onRefetchThread) {
+		t36 = onRefetchThread && { unstable_refetchThread: onRefetchThread };
+		$[97] = onRefetchThread;
+		$[98] = t36;
+	} else t36 = $[98];
+	let t37;
+	if ($[99] !== onLoadExternalState) {
+		t37 = (state_0) => {
 			if (!onLoadExternalState) throw new Error("Runtime does not support importing external states (onLoadExternalState is not set).");
 			onLoadExternalState(state_0);
 		};
-		$[92] = onLoadExternalState;
-		$[93] = t34;
-	} else t34 = $[93];
-	let t35;
-	if ($[94] !== messageClients) {
-		t35 = (selector) => {
+		$[99] = onLoadExternalState;
+		$[100] = t37;
+	} else t37 = $[100];
+	let t38;
+	if ($[101] !== messageClients) {
+		t38 = (selector) => {
 			if ("id" in selector) return messageClients.get({ key: selector.id });
 			return messageClients.get(selector);
 		};
-		$[94] = messageClients;
-		$[95] = t35;
-	} else t35 = $[95];
-	let t36;
-	if ($[96] !== handleCancelRun || $[97] !== speechController.stop || $[98] !== t29 || $[99] !== t30 || $[100] !== t31 || $[101] !== t32 || $[102] !== t33 || $[103] !== t34 || $[104] !== t35) {
-		t36 = {
-			getState: t29,
-			composer: t30,
-			append: t31,
+		$[101] = messageClients;
+		$[102] = t38;
+	} else t38 = $[102];
+	let t39;
+	if ($[103] !== handleCancelRun || $[104] !== speechController.stop || $[105] !== t30 || $[106] !== t31 || $[107] !== t32 || $[108] !== t33 || $[109] !== t34 || $[110] !== t35 || $[111] !== t36 || $[112] !== t37 || $[113] !== t38) {
+		t39 = {
+			getState: t30,
+			composer: t31,
+			suggestions: t32,
+			append: t33,
 			deleteMessage: _temp0,
-			startRun: t32,
-			resumeRun: t33,
+			startRun: t34,
+			resumeRun: t35,
 			cancelRun: handleCancelRun,
-			importExternalState: t34,
+			...t36,
+			importExternalState: t37,
 			getModelContext: _temp1,
 			export: _temp10,
 			import: _temp11,
 			reset: _temp12,
-			message: t35,
+			message: t38,
 			stopSpeaking: speechController.stop,
 			connectVoice: _temp13,
 			disconnectVoice: _temp14,
@@ -1260,18 +1345,20 @@ const useExternalThread = (t0) => {
 			muteVoice: _temp18,
 			unmuteVoice: _temp19
 		};
-		$[96] = handleCancelRun;
-		$[97] = speechController.stop;
-		$[98] = t29;
-		$[99] = t30;
-		$[100] = t31;
-		$[101] = t32;
-		$[102] = t33;
-		$[103] = t34;
-		$[104] = t35;
-		$[105] = t36;
-	} else t36 = $[105];
-	return t36;
+		$[103] = handleCancelRun;
+		$[104] = speechController.stop;
+		$[105] = t30;
+		$[106] = t31;
+		$[107] = t32;
+		$[108] = t33;
+		$[109] = t34;
+		$[110] = t35;
+		$[111] = t36;
+		$[112] = t37;
+		$[113] = t38;
+		$[114] = t39;
+	} else t39 = $[114];
+	return t39;
 };
 const ExternalThread = resource(useExternalThread);
 attachTransformScopes(useExternalThread, (scopes, parent) => {
@@ -1298,7 +1385,11 @@ attachTransformScopes(useExternalThread, (scopes, parent) => {
 	if (!scopes.modelContext && parent.modelContext.source === null) scopes.modelContext = ModelContext();
 	if (!scopes.tools && parent.tools.source === null) scopes.tools = Tools({});
 	if (!scopes.dataRenderers && parent.dataRenderers.source === null) scopes.dataRenderers = DataRenderers();
-	if (!scopes.suggestions && parent.suggestions.source === null) scopes.suggestions = Suggestions();
+	if (!scopes.suggestions && parent.suggestions.source === null) scopes.suggestions = Derived({
+		source: "thread",
+		query: {},
+		get: (aui) => aui.thread.suggestions()
+	});
 });
 function _temp() {}
 function _temp2(attachment) {