@assistant-ui/core 0.3.17 → 0.3.19

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

@@ -3,9 +3,10 @@ import { fileMatchesAccept } from "../../adapters/attachment.js";
 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 { isAttachmentComplete, isCreateAttachment } from "../../types/attachment.js";
 import { AttachmentAddOperations, drainAttachmentAdd } from "../../runtime/utils/attachment-add-operations.js";
 import { ThreadSuggestions } from "./suggestions.js";
+import { TaskClient, createTaskDeriver, getTaskKey } from "./thread-tasks.js";
 import { ModelContext } from "./model-context-client.js";
 import { DataRenderers } from "../../react/client/DataRenderers.js";
 import { Tools } from "../../react/client/Tools.js";
@@ -398,6 +399,22 @@ const useLiveState = (initial) => {
 	} else t1 = $[2];
 	return t1;
 };
+const removeAttachmentThroughAdapter = async (attachment, attachmentAdapter, setAttachments) => {
+	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));
+		throw error;
+	}
+};
 const useComposerClientResource = (t0) => {
 	const $ = c(108);
 	const { type, canCancel, isRunning: t1, isSendDisabled: t2, onCancel, onBeginEdit, onSend, message, queue, attachmentAdapter } = t0;
@@ -449,7 +466,7 @@ const useComposerClientResource = (t0) => {
 				attachment,
 				onRemove: async () => {
 					attachmentAddOperations.cancel(attachment.id);
-					await attachmentAdapter?.remove(attachment);
+					if (!isAttachmentComplete(attachment)) await removeAttachmentThroughAdapter(attachment, attachmentAdapter, setAttachments);
 					setAttachments((prev) => prev.filter((a) => a.id !== attachment.id));
 				}
 			}));
@@ -468,7 +485,7 @@ const useComposerClientResource = (t0) => {
 	if ($[15] !== attachmentAdapter) {
 		t8 = async (removed) => {
 			if (!attachmentAdapter) return;
-			await Promise.all(removed.filter(_temp6).map((a_1) => attachmentAdapter.remove(a_1)));
+			await Promise.all(removed.filter(_temp6).map(async (a_1) => attachmentAdapter.remove(a_1)));
 		};
 		$[15] = attachmentAdapter;
 		$[16] = t8;
@@ -873,7 +890,7 @@ const dedupeMessagesById = (messages) => {
 	return deduped.length === messages.length ? messages : deduped.reverse();
 };
 const useExternalThread = (t0) => {
-	const $ = c(115);
+	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 isRunning = t1 === void 0 ? false : t1;
 	const isLoading = t2 === void 0 ? false : t2;
@@ -1047,42 +1064,62 @@ const useExternalThread = (t0) => {
 	} else t17 = $[38];
 	const messageClients = useClientLookup(t17);
 	let t18;
-	if ($[39] !== onCancel || $[40] !== queue) {
-		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 (!onCancel) return;
 			queue?.__internal_notifyCancelled?.();
 			onCancel();
 		};
-		$[39] = onCancel;
-		$[40] = queue;
-		$[41] = t18;
-	} else t18 = $[41];
-	const handleCancelRun = t18;
-	let t19;
-	if ($[42] !== messages || $[43] !== onNew) {
-		t19 = (message_1) => {
+		$[44] = onCancel;
+		$[45] = queue;
+		$[46] = t21;
+	} else t21 = $[46];
+	const handleCancelRun = t21;
+	let t22;
+	if ($[47] !== messages || $[48] !== onNew) {
+		t22 = (message_1) => {
 			onNew?.({
 				...message_1,
 				parentId: messages.at(-1)?.id ?? null
 			});
 		};
-		$[42] = messages;
-		$[43] = onNew;
-		$[44] = t19;
-	} else t19 = $[44];
-	const handleSendNew = t19;
-	let t20;
-	if ($[45] !== messages) {
-		t20 = messages.at(-1)?.id ?? null;
-		$[45] = messages;
-		$[46] = t20;
-	} else t20 = $[46];
-	const headId = t20;
+		$[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;
 	const hasCancel = !!onCancel;
 	const hasRefetchThread = !!onRefetchThread;
-	let t21;
-	if ($[47] !== headId || $[48] !== queue) {
-		t21 = queue && {
+	let t24;
+	if ($[52] !== headId || $[53] !== queue) {
+		t24 = queue && {
 			...queue,
 			enqueue: (message_2) => queue.enqueue({
 				...message_2,
@@ -1093,17 +1130,17 @@ const useExternalThread = (t0) => {
 				parentId: message_3.parentId ?? headId
 			})
 		};
-		$[47] = headId;
-		$[48] = queue;
-		$[49] = t21;
-	} else t21 = $[49];
-	const composerQueue = t21;
-	const t22 = isRunning && hasCancel;
-	let t23;
-	if ($[50] !== attachmentAdapter || $[51] !== composerQueue || $[52] !== handleCancelRun || $[53] !== handleSendNew || $[54] !== isRunning || $[55] !== isSendDisabled || $[56] !== t22) {
-		t23 = ComposerClientResource({
+		$[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({
 			type: "thread",
-			canCancel: t22,
+			canCancel: t25,
 			isRunning,
 			isSendDisabled,
 			onCancel: handleCancelRun,
@@ -1111,22 +1148,22 @@ const useExternalThread = (t0) => {
 			queue: composerQueue,
 			attachmentAdapter
 		});
-		$[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);
+		$[55] = attachmentAdapter;
+		$[56] = composerQueue;
+		$[57] = handleCancelRun;
+		$[58] = handleSendNew;
+		$[59] = isRunning;
+		$[60] = isSendDisabled;
+		$[61] = t25;
+		$[62] = t26;
+	} else t26 = $[62];
+	const composerClient = useClientResource(t26);
+	let t27;
+	if ($[63] === Symbol.for("react.memo_cache_sentinel")) {
+		t27 = ThreadSuggestions(EMPTY_SUGGESTIONS);
+		$[63] = t27;
+	} else t27 = $[63];
+	const suggestionsClient = useClientResource(t27);
 	const hasQueue = !!queue;
 	const hasBranches = !!branches;
 	const hasEdit = !!onEdit;
@@ -1134,17 +1171,17 @@ const useExternalThread = (t0) => {
 	const hasAttachments = !!attachmentAdapter;
 	const hasFeedback = !!feedbackAdapter;
 	const hasSpeech = !!speechAdapter;
-	let t25;
-	if ($[59] !== messageClients.state) {
-		t25 = messageClients.state.map(_temp0);
-		$[59] = messageClients.state;
-		$[60] = t25;
-	} else t25 = $[60];
-	const messageStates = t25;
-	const t26 = messages.length === 0 && !isLoading;
-	let t27;
-	if ($[61] !== hasAttachments || $[62] !== hasBranches || $[63] !== hasCancel || $[64] !== hasEdit || $[65] !== hasFeedback || $[66] !== hasQueue || $[67] !== hasRefetchThread || $[68] !== hasReload || $[69] !== hasSpeech) {
-		t27 = {
+	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 = {
 			edit: hasEdit,
 			delete: false,
 			reload: hasReload,
@@ -1160,72 +1197,87 @@ const useExternalThread = (t0) => {
 			dictation: false,
 			queue: hasQueue
 		};
-		$[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 ($[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,
+		$[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,
 			isDisabled: false,
 			isLoading,
 			isRunning,
-			capabilities: t27,
+			capabilities: t30,
 			messages: messageStates,
-			state: t28,
+			tasks,
+			state: t31,
 			suggestions: EMPTY_SUGGESTIONS,
 			extras,
 			speech,
 			voice: void 0,
 			composer: composerClient.state
 		};
-		$[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 ($[83] !== state) {
-		t30 = () => state;
-		$[83] = state;
-		$[84] = t30;
-	} else t30 = $[84];
-	let t31;
-	if ($[85] !== composerClient.methods) {
-		t31 = () => composerClient.methods;
-		$[85] = composerClient.methods;
+		$[78] = composerClient.state;
+		$[79] = extras;
+		$[80] = isLoading;
+		$[81] = isRunning;
+		$[82] = messageStates;
+		$[83] = speech;
+		$[84] = t29;
+		$[85] = t30;
 		$[86] = t31;
-	} else t31 = $[86];
-	let t32;
-	if ($[87] !== suggestionsClient) {
-		t32 = () => suggestionsClient.methods;
-		$[87] = suggestionsClient;
+		$[87] = tasks;
 		$[88] = t32;
 	} else t32 = $[88];
+	const state = t32;
 	let t33;
-	if ($[89] !== messages || $[90] !== onNew || $[91] !== queue) {
-		t33 = (message_4) => {
+	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) => {
+			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" ? {
 				createdAt: /* @__PURE__ */ new Date(),
 				parentId: messages.at(-1)?.id ?? null,
@@ -1240,7 +1292,7 @@ const useExternalThread = (t0) => {
 				metadata: { custom: {} }
 			} : {
 				createdAt: message_4.createdAt ?? /* @__PURE__ */ new Date(),
-				parentId: message_4.parentId ?? messages.at(-1)?.id ?? null,
+				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,
@@ -1252,92 +1304,94 @@ const useExternalThread = (t0) => {
 			if (queue) queue.enqueue(appendMessage);
 			else onNew?.(appendMessage);
 		};
-		$[89] = messages;
-		$[90] = onNew;
-		$[91] = queue;
-		$[92] = t33;
-	} else t33 = $[92];
-	let t34;
-	if ($[93] !== onStartRun) {
-		t34 = () => {
+		$[98] = messages;
+		$[99] = onNew;
+		$[100] = queue;
+		$[101] = t37;
+	} else t37 = $[101];
+	let t38;
+	if ($[102] !== onStartRun) {
+		t38 = () => {
 			onStartRun?.();
 		};
-		$[93] = onStartRun;
-		$[94] = t34;
-	} else t34 = $[94];
-	let t35;
-	if ($[95] !== onResume) {
-		t35 = () => {
+		$[102] = onStartRun;
+		$[103] = t38;
+	} else t38 = $[103];
+	let t39;
+	if ($[104] !== onResume) {
+		t39 = () => {
 			if (!onResume) throw new Error("Runtime does not support resuming runs (onResume is not set).");
 			onResume();
 		};
-		$[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) => {
+		$[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) => {
 			if (!onLoadExternalState) throw new Error("Runtime does not support importing external states (onLoadExternalState is not set).");
 			onLoadExternalState(state_0);
 		};
-		$[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);
+		$[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 });
+			return messageClients.get(selector_0);
 		};
-		$[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: _temp1,
-			startRun: t34,
-			resumeRun: t35,
+		$[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,
 			cancelRun: handleCancelRun,
-			...t36,
-			importExternalState: t37,
-			getModelContext: _temp10,
-			export: _temp11,
-			import: _temp12,
-			reset: _temp13,
-			message: t38,
+			...t40,
+			importExternalState: t41,
+			getModelContext: _temp11,
+			export: _temp12,
+			import: _temp13,
+			reset: _temp14,
+			message: t42,
 			stopSpeaking: speechController.stop,
-			connectVoice: _temp14,
-			disconnectVoice: _temp15,
-			getVoiceVolume: _temp16,
-			subscribeVoiceVolume: _temp18,
-			muteVoice: _temp19,
-			unmuteVoice: _temp20
+			connectVoice: _temp15,
+			disconnectVoice: _temp16,
+			getVoiceVolume: _temp17,
+			subscribeVoiceVolume: _temp19,
+			muteVoice: _temp20,
+			unmuteVoice: _temp21
 		};
-		$[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;
+		$[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;
 };
 const ExternalThread = resource(useExternalThread);
 attachTransformScopes(useExternalThread, (scopes, parent) => {
@@ -1392,35 +1446,38 @@ function _temp7(error_1) {
 }
 function _temp8() {}
 function _temp9() {}
-function _temp0(s, idx, arr) {
+function _temp0(task) {
+	return withKey(getTaskKey(task), TaskClient({ task }), [task]);
+}
+function _temp1(s, idx, arr) {
 	return {
 		...s,
 		isLast: idx === arr.length - 1
 	};
 }
-function _temp1() {}
-function _temp10() {
+function _temp10() {}
+function _temp11() {
 	return {
 		tools: {},
 		config: {}
 	};
 }
-function _temp11() {
+function _temp12() {
 	return { messages: [] };
 }
-function _temp12() {}
 function _temp13() {}
 function _temp14() {}
 function _temp15() {}
-function _temp16() {
+function _temp16() {}
+function _temp17() {
 	return 0;
 }
-function _temp17() {}
-function _temp18() {
-	return _temp17;
+function _temp18() {}
+function _temp19() {
+	return _temp18;
 }
-function _temp19() {}
 function _temp20() {}
+function _temp21() {}
 //#endregion
 export { ExternalThread };