@assistant-ui/core 0.3.15 → 0.3.17

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

@@ -1,18 +1,20 @@
+import { generateId } from "../../utils/id.js";
 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 { AttachmentAddOperations, drainAttachmentAdd } from "../../runtime/utils/attachment-add-operations.js";
 import { ThreadSuggestions } from "./suggestions.js";
 import { ModelContext } from "./model-context-client.js";
 import { DataRenderers } from "../../react/client/DataRenderers.js";
 import { Tools } from "../../react/client/Tools.js";
 import { SingleThreadList } from "./single-thread-list.js";
+import { Derived, attachTransformScopes, useClientLookup, useClientResource } from "@assistant-ui/store/client";
 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 { Derived, attachTransformScopes, useClientLookup, useClientResource } from "@assistant-ui/store/client";
 //#region src/store/clients/external-thread.ts
 const EMPTY_QUEUE_ITEMS = [];
 const EMPTY_BRANCH_IDS = [];
@@ -321,7 +323,13 @@ const usePartResource = (t0) => {
 			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");
 			if (!part.approval || part.approval.approved !== void 0 || part.approval.resolution !== void 0) throw new Error("Tool call has no pending approval");
-			onRespondToToolApproval(resolveToolApprovalResponse(part.approval, response_0));
+			const options = resolveToolApprovalResponse(part.approval, response_0);
+			try {
+				return Promise.resolve(onRespondToToolApproval(options));
+			} catch (t7) {
+				const error = t7;
+				return Promise.reject(error);
+			}
 		};
 		$[12] = onRespondToToolApproval;
 		$[13] = part;
@@ -353,39 +361,6 @@ 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,
@@ -398,11 +373,6 @@ 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) if (!upsert(attachment)) break;
-	} else upsert(await result);
-};
 const useLiveState = (initial) => {
 	const $ = c(3);
 	const [state, setState] = useState(initial);
@@ -429,7 +399,7 @@ const useLiveState = (initial) => {
 	return t1;
 };
 const useComposerClientResource = (t0) => {
-	const $ = c(105);
+	const $ = c(108);
 	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;
@@ -611,7 +581,7 @@ const useComposerClientResource = (t0) => {
 			if (!isCreateAttachment(fileOrAttachment) && attachmentAdapter) {
 				const operation = attachmentAddOperations.start();
 				try {
-					await drainAdapterAdd(attachmentAdapter.add({ file: fileOrAttachment }), (attachment_1) => {
+					await drainAttachmentAdd(attachmentAdapter.add({ file: fileOrAttachment }), (attachment_1) => {
 						if (!attachmentAddOperations.accept(operation, attachment_1.id)) return false;
 						upsertAttachment(attachment_1);
 						return true;
@@ -624,7 +594,7 @@ const useComposerClientResource = (t0) => {
 				}
 			} else if (!isCreateAttachment(fileOrAttachment)) {
 				const newAttachment = {
-					id: Math.random().toString(36).substring(7),
+					id: generateId(),
 					type: "file",
 					name: fileOrAttachment.name,
 					contentType: fileOrAttachment.type,
@@ -635,7 +605,7 @@ const useComposerClientResource = (t0) => {
 				setAttachments((prev_1) => [...prev_1, newAttachment]);
 			} else {
 				const newAttachment_0 = {
-					id: fileOrAttachment.id ?? Math.random().toString(36).substring(7),
+					id: fileOrAttachment.id ?? generateId(),
 					type: fileOrAttachment.type ?? "document",
 					name: fileOrAttachment.name,
 					contentType: fileOrAttachment.contentType,
@@ -756,18 +726,27 @@ const useComposerClientResource = (t0) => {
 		$[78] = t19;
 	} else t19 = $[78];
 	let t20;
-	if ($[79] !== onCancel || $[80] !== setIsEditing || $[81] !== type) {
+	if ($[79] !== attachmentsRef || $[80] !== onCancel || $[81] !== removePendingAttachments || $[82] !== setAttachments || $[83] !== setIsEditing || $[84] !== type) {
 		t20 = () => {
+			if (type === "edit") {
+				attachmentAddOperations.cancelAll();
+				const removed_2 = attachmentsRef.current;
+				setAttachments([]);
+				removePendingAttachments(removed_2).catch(_temp7);
+			}
 			onCancel?.();
 			if (type === "edit") setIsEditing(false);
 		};
-		$[79] = onCancel;
-		$[80] = setIsEditing;
-		$[81] = type;
-		$[82] = t20;
-	} else t20 = $[82];
+		$[79] = attachmentsRef;
+		$[80] = onCancel;
+		$[81] = removePendingAttachments;
+		$[82] = setAttachments;
+		$[83] = setIsEditing;
+		$[84] = type;
+		$[85] = t20;
+	} else t20 = $[85];
 	let t21;
-	if ($[83] !== isEditingRef || $[84] !== onBeginEdit || $[85] !== setIsEditing || $[86] !== type || $[87] !== updateFromMessage) {
+	if ($[86] !== isEditingRef || $[87] !== onBeginEdit || $[88] !== setIsEditing || $[89] !== type || $[90] !== updateFromMessage) {
 		t21 = () => {
 			onBeginEdit?.();
 			if (type === "thread") return;
@@ -775,24 +754,24 @@ const useComposerClientResource = (t0) => {
 			setIsEditing(true);
 			updateFromMessage();
 		};
-		$[83] = isEditingRef;
-		$[84] = onBeginEdit;
-		$[85] = setIsEditing;
-		$[86] = type;
-		$[87] = updateFromMessage;
-		$[88] = t21;
-	} else t21 = $[88];
+		$[86] = isEditingRef;
+		$[87] = onBeginEdit;
+		$[88] = setIsEditing;
+		$[89] = type;
+		$[90] = updateFromMessage;
+		$[91] = t21;
+	} else t21 = $[91];
 	let t22;
-	if ($[89] !== queueItemClients) {
+	if ($[92] !== queueItemClients) {
 		t22 = (selector_0) => {
 			if ("id" in selector_0) return queueItemClients.get({ key: selector_0.id });
 			return queueItemClients.get(selector_0);
 		};
-		$[89] = queueItemClients;
-		$[90] = t22;
-	} else t22 = $[90];
+		$[92] = queueItemClients;
+		$[93] = t22;
+	} else t22 = $[93];
 	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) {
+	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,
 			setText,
@@ -805,26 +784,26 @@ const useComposerClientResource = (t0) => {
 			send: t19,
 			cancel: t20,
 			beginEdit: t21,
-			startDictation: _temp7,
-			stopDictation: _temp8,
+			startDictation: _temp8,
+			stopDictation: _temp9,
 			setQuote,
 			queueItem: t22
 		};
-		$[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];
+		$[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;
 };
 const ComposerClientResource = resource(useComposerClientResource);
@@ -1157,7 +1136,7 @@ const useExternalThread = (t0) => {
 	const hasSpeech = !!speechAdapter;
 	let t25;
 	if ($[59] !== messageClients.state) {
-		t25 = messageClients.state.map(_temp9);
+		t25 = messageClients.state.map(_temp0);
 		$[59] = messageClients.state;
 		$[60] = t25;
 	} else t25 = $[60];
@@ -1326,24 +1305,24 @@ const useExternalThread = (t0) => {
 			composer: t31,
 			suggestions: t32,
 			append: t33,
-			deleteMessage: _temp0,
+			deleteMessage: _temp1,
 			startRun: t34,
 			resumeRun: t35,
 			cancelRun: handleCancelRun,
 			...t36,
 			importExternalState: t37,
-			getModelContext: _temp1,
-			export: _temp10,
-			import: _temp11,
-			reset: _temp12,
+			getModelContext: _temp10,
+			export: _temp11,
+			import: _temp12,
+			reset: _temp13,
 			message: t38,
 			stopSpeaking: speechController.stop,
-			connectVoice: _temp13,
-			disconnectVoice: _temp14,
-			getVoiceVolume: _temp15,
-			subscribeVoiceVolume: _temp17,
-			muteVoice: _temp18,
-			unmuteVoice: _temp19
+			connectVoice: _temp14,
+			disconnectVoice: _temp15,
+			getVoiceVolume: _temp16,
+			subscribeVoiceVolume: _temp18,
+			muteVoice: _temp19,
+			unmuteVoice: _temp20
 		};
 		$[103] = handleCancelRun;
 		$[104] = speechController.stop;
@@ -1408,37 +1387,40 @@ function _temp5(part_0) {
 function _temp6(a_0) {
 	return a_0.status.type !== "complete";
 }
-function _temp7() {}
+function _temp7(error_1) {
+	console.error("Failed to remove cancelled edit attachments", error_1);
+}
 function _temp8() {}
-function _temp9(s, idx, arr) {
+function _temp9() {}
+function _temp0(s, idx, arr) {
 	return {
 		...s,
 		isLast: idx === arr.length - 1
 	};
 }
-function _temp0() {}
-function _temp1() {
+function _temp1() {}
+function _temp10() {
 	return {
 		tools: {},
 		config: {}
 	};
 }
-function _temp10() {
+function _temp11() {
 	return { messages: [] };
 }
-function _temp11() {}
 function _temp12() {}
 function _temp13() {}
 function _temp14() {}
-function _temp15() {
+function _temp15() {}
+function _temp16() {
 	return 0;
 }
-function _temp16() {}
-function _temp17() {
-	return _temp16;
+function _temp17() {}
+function _temp18() {
+	return _temp17;
 }
-function _temp18() {}
 function _temp19() {}
+function _temp20() {}
 //#endregion
 export { ExternalThread };