@agent-native/toolkit 0.206.0 → 0.206.1-nightly-20261009213000

package/dist/app/chat/AgentKitAssistantChat.js

@@ -1,6 +1,6 @@
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { hasActiveAgentRuns, selectAgentSuggestions, isCurrentAgentSuggestion, } from "@agent-native/agentkit";
-import { MAX_AGENT_REQUEST_ATTACHMENT_DATA_CHARS } from "@agent-native/agentkit/protocol";
+import { AgentKitUploadError, hasActiveAgentRuns, selectAgentSuggestions, isCurrentAgentSuggestion, } from "@agent-native/agentkit";
+import { MAX_AGENT_REQUEST_ATTACHMENT_DATA_CHARS, isInlineDataUrl, persistableFilePart, } from "@agent-native/agentkit/protocol";
 import { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "@agent-native/core/agent/chatgpt-subscription-contract";
 import { isCreditsLimitErrorCode } from "@agent-native/core/agent/engine/error-detail";
 import { appendAgentChatContextToMessage, filterAgentChatContextItems, formatAgentChatContextItemsForPrompt, getAgentChatContextState, normalizeAgentChatContextItem, publishAgentChatContextItems, reportAgentChatSubmitResult, refreshAgentChatContext, subscribeAgentChatContext, } from "@agent-native/core/client/agent-chat";
@@ -26,8 +26,9 @@ import { writeClipboardText } from "@agent-native/toolkit/clipboard";
 import { AgentSuggestionBar, agentSuggestionPrompt, snapshotComposerContextItems, AGENT_PROMPT_MAX_INLINE_IMAGE_BYTES, readAgentPromptAttachment, } from "@agent-native/toolkit/composer";
 import { appendRealtimeVoiceTranscriptToRepository, realtimeVoiceTranscriptRegistry, } from "@agent-native/toolkit/composer/realtime-voice-transcript";
 import { IconButton } from "@agent-native/toolkit/design-system";
+import { DropdownMenu, DropdownMenuContent, DropdownMenuItem, DropdownMenuTrigger, } from "@agent-native/toolkit/ui/dropdown-menu";
 import { cn } from "@agent-native/toolkit/utils";
-import { IconAlertTriangle, IconCircleCheck, IconCopy, IconMessage, IconPlayerStopFilled, IconQuote, IconRefresh, IconX, } from "@tabler/icons-react";
+import { IconAlertTriangle, IconCircleCheck, IconCopy, IconDotsVertical, IconMessage, IconPlayerStopFilled, IconQuote, IconRefresh, IconX, } from "@tabler/icons-react";
 import React, { createContext, forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef, useState, } from "react";
 import { AgentKitChat, AgentKitComposer, AgentApprovalPrompt, AgentMessageView, useAgentKit, useAgentKitControl, useAgentThread, } from "../agentkit/react/index.js";
 import { AgentKitDevCheckpointProvider, AgentKitDevCheckpointRestore, useOptionalAgentKitHistory, } from "./agentkit-chat/history.js";
@@ -507,6 +508,7 @@ export const AgentKitAssistantChat = forwardRef(function AgentKitAssistantChat(p
             name: "{{name}}",
         }),
         pastedText: t("agentChat.pastedText.title"),
+        attachmentNotSaved: t("agentChat.composer.attachmentNotSaved"),
         imagePreview: t("agentChat.composer.imagePreview"),
         closePreview: t("agentChat.composer.closePreview"),
         dropFilesToAttach: t("agentChat.composer.dropToAttach"),
@@ -546,43 +548,28 @@ export const AgentKitAssistantChat = forwardRef(function AgentKitAssistantChat(p
             form.set(key, value);
         }
         form.set("file", file.body, file.name);
-        const response = await fetch(target.url, {
-            method: target.method,
-            headers: target.headers,
-            body: form,
-            signal: context?.signal,
-        });
-        if (!response.ok) {
-            const messageKey = response.status === 415
-                ? "agentChat.composer.unsupportedFileType"
-                : response.status === 413
-                    ? "agentChat.composer.fileTooLarge"
-                    : response.status === 401
-                        ? "agentChat.composer.sessionExpired"
-                        : undefined;
-            const message = messageKey
-                ? translatorRef.current(messageKey)
-                : translatorRef.current("agentChat.composer.uploadFailed");
-            const error = new Error(message);
-            Object.assign(error, {
-                code: response.status === 413
-                    ? "upload_too_large"
-                    : response.status === 401
-                        ? "upload_session_expired"
-                        : response.status === 415
-                            ? "upload_unsupported_type"
-                            : `upload_http_${response.status}`,
-                status: response.status,
-                retryable: response.status === 408 ||
-                    response.status === 429 ||
-                    response.status >= 500,
+        let response;
+        try {
+            response = await fetch(target.url, {
+                method: target.method,
+                headers: target.headers,
+                body: form,
+                signal: context?.signal,
             });
-            throw error;
+        }
+        catch (error) {
+            if (context?.signal?.aborted)
+                throw error;
+            throw Object.assign(new Error(translatorRef.current("agentChat.composer.uploadOffline")), { code: "upload_network_error", retryable: true, cause: error });
+        }
+        // The server's error body is never shown: its text is untranslated.
+        if (!response.ok) {
+            throw uploadHttpError(response.status, translatorRef.current);
         }
         const result = await response.json();
         const uploaded = asRecord(result);
         if (typeof uploaded?.url !== "string" || !uploaded.url) {
-            throw new TypeError("File upload response did not include a URL.");
+            throw Object.assign(new Error(translatorRef.current("agentChat.composer.uploadFailed")), { code: "upload_invalid_response", retryable: false });
         }
         uploadedFilesRef.current.set(target.uploadId, {
             type: "file",
@@ -1422,6 +1409,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
             : await uploadAgentChatAttachments(control, attachments, files, {
                 storageConfigured: fileStorageConfigured,
                 storageUnavailableMessage: t("onboarding.fileStorage.title"),
+                fileTooLargeMessage: uploadTooLargeMessage(t),
             });
         const fileParts = uploadedAttachments.fileParts;
         let requestAttachments = options.deferredRequestAttachments ??
@@ -1458,7 +1446,9 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
         if (inlineImageDataChars > MAX_AGENT_REQUEST_ATTACHMENT_DATA_CHARS) {
             throw new Error(t("agentChat.composer.requestTooLarge"));
         }
-        composerOptions.validateSubmission?.();
+        // Readiness was gated before the upload; a provider status refresh during
+        // it must not discard the upload, only a change of thread or scope.
+        composerOptions.validateSubmissionScope?.();
         const selectionChangedDuringSubmission = selectionRevision !== selectionRevisionRef.current ||
             (options.pendingSelectionCapturedAt !== undefined &&
                 options.pendingSelectionCapturedAt !==
@@ -1626,8 +1616,12 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                         : await uploadAgentChatAttachments(control, attachments, files, {
                             storageConfigured: fileStorageConfigured,
                             storageUnavailableMessage: t("onboarding.fileStorage.title"),
+                            fileTooLargeMessage: uploadTooLargeMessage(t),
                         });
-                    const fileParts = uploadedAttachments.fileParts;
+                    const fileParts = await durableFileParts(control, uploadedAttachments.fileParts, {
+                        storageConfigured: fileStorageConfigured,
+                        storageUnavailableMessage: t("onboarding.fileStorage.title"),
+                    });
                     if (!fileStorageConfigured &&
                         uploadedAttachments.requestAttachments.some((attachment) => attachment.data)) {
                         throw new Error(t("onboarding.fileStorage.title"));
@@ -1668,6 +1662,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                     delete deferredComposerOptions.attachments;
                     delete deferredComposerOptions.onLocalSubmit;
                     delete deferredComposerOptions.validateSubmission;
+                    delete deferredComposerOptions.validateSubmissionScope;
                     deferredComposerOptions.model ??= props.selectedModel;
                     deferredComposerOptions.engine ??= props.selectedEngine;
                     deferredComposerOptions.effort ??= props.selectedEffort;
@@ -2347,13 +2342,10 @@ function AgentKitTranscript({ children, threadId }) {
     }
     return (_jsxs(_Fragment, { children: [thread.messages.length > 0 || surface.hasRenderedMessages ? (_jsx(AgentKitHistoryBeginningRevert, {})) : null, surface.threadRestore.status === "error" ? (_jsxs("div", { className: "mx-4 mt-3 flex items-center justify-between gap-3 rounded-md border border-border px-3 py-2 text-xs text-muted-foreground", role: "alert", children: [_jsx("span", { children: surface.threadRestore.notFound
                             ? t("agentChat.message.threadNotFound")
-                            : t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: surface.retryThreadRestore, className: "shrink-0 rounded px-2 py-1 hover:bg-accent hover:text-foreground", children: t("agentChat.common.retry") })] })) : null, renderThreadSlot(surface.props.threadContentSlot, threadId, surface.props.tabId), children, activeRunId ? (_jsxs("div", { className: "agentkit-activities-static", "data-agentkit-active-run-id-copy": "true", children: [_jsx(IconButton, { label: activeRunRequestIdCopyStatus === "copied"
-                            ? t("agentChat.common.copied")
-                            : activeRunRequestIdCopyStatus === "failed"
-                                ? t("agentChat.recovery.copyFailed")
-                                : t("agentChat.message.copyRequestId"), title: t("agentChat.message.copyRequestId"), icon: activeRunRequestIdCopyStatus === "copied" ? (_jsx(IconCircleCheck, { "aria-hidden": "true" })) : activeRunRequestIdCopyStatus === "failed" ? (_jsx(IconAlertTriangle, { "aria-hidden": "true" })) : (_jsx(IconCopy, { "aria-hidden": "true" })), size: "compact", onPress: () => void copyActiveRunRequestId() }), activeRunRequestIdCopyStatus ? (_jsx("span", { className: "sr-only", role: activeRunRequestIdCopyStatus === "failed" ? "alert" : "status", children: activeRunRequestIdCopyStatus === "copied"
-                            ? t("agentChat.common.copied")
-                            : t("agentChat.recovery.copyFailed") })) : null] })) : null, handoffMessages.map((message) => (_jsx(AgentMessageView, { value: message, threadId: threadId }, message.id))), pendingVoiceMessages.map((message) => (_jsx(AgentMessageView, { value: message, threadId: threadId }, message.id))), showThinking ? (_jsx("div", { className: "agentkit-activities agentkit-activities-summary-content", role: "status", "aria-live": "polite", children: _jsx("span", { className: "agentkit-activities-current", "data-running": "true", "data-agentkit-current-activity": "true", children: _jsx("span", { className: "agentkit-activities-current-label agent-running-shimmer", children: t("agentChat.status.thinking") }) }) })) : null, surface.props.showGuidedQuestions !== false &&
+                            : t("agentChat.message.restoreRequestFailed") }), _jsx("button", { type: "button", onClick: surface.retryThreadRestore, className: "shrink-0 rounded px-2 py-1 hover:bg-accent hover:text-foreground", children: t("agentChat.common.retry") })] })) : null, renderThreadSlot(surface.props.threadContentSlot, threadId, surface.props.tabId), children, activeRunId ? (_jsxs("div", { className: "agentkit-activities-static agentkit-active-run-actions", "data-agentkit-active-run-id-copy": "true", children: [activeRunRequestIdCopyStatus ? (_jsxs("span", { className: cn("agentkit-active-run-actions-feedback", activeRunRequestIdCopyStatus === "failed" &&
+                            "agentkit-active-run-actions-feedback-error"), role: activeRunRequestIdCopyStatus === "failed" ? "alert" : "status", children: [activeRunRequestIdCopyStatus === "copied" ? (_jsx(IconCircleCheck, { size: 14, "aria-hidden": "true" })) : (_jsx(IconAlertTriangle, { size: 14, "aria-hidden": "true" })), activeRunRequestIdCopyStatus === "copied"
+                                ? t("agentChat.common.copied")
+                                : t("agentChat.recovery.copyFailed")] })) : null, _jsxs(DropdownMenu, { children: [_jsx(DropdownMenuTrigger, { asChild: true, children: _jsx(IconButton, { label: t("agentChat.message.actions"), title: t("agentChat.message.actions"), icon: _jsx(IconDotsVertical, { "aria-hidden": "true" }), size: "compact", className: "agentkit-active-run-actions-trigger" }) }), _jsx(DropdownMenuContent, { align: "end", sideOffset: 6, children: _jsxs(DropdownMenuItem, { onSelect: () => void copyActiveRunRequestId(), children: [activeRunRequestIdCopyStatus === "copied" ? (_jsx(IconCircleCheck, { size: 14, "aria-hidden": "true" })) : activeRunRequestIdCopyStatus === "failed" ? (_jsx(IconAlertTriangle, { size: 14, "aria-hidden": "true" })) : (_jsx(IconCopy, { size: 14, "aria-hidden": "true" })), t("agentChat.message.copyRequestId")] }) })] })] })) : null, handoffMessages.map((message) => (_jsx(AgentMessageView, { value: message, threadId: threadId }, message.id))), pendingVoiceMessages.map((message) => (_jsx(AgentMessageView, { value: message, threadId: threadId }, message.id))), showThinking ? (_jsx("div", { className: "agentkit-activities agentkit-activities-summary-content", role: "status", "aria-live": "polite", children: _jsx("span", { className: "agentkit-activities-current", "data-running": "true", "data-agentkit-current-activity": "true", children: _jsx("span", { className: "agentkit-activities-current-label agent-running-shimmer", children: t("agentChat.status.thinking") }) }) })) : null, surface.props.showGuidedQuestions !== false &&
                 guided.questions?.length ? (_jsx("div", { className: "px-3 pb-3", children: _jsx(GuidedQuestionFlow, { questions: guided.questions, onSubmit: guided.handleSubmit, onSkip: guided.handleSkip, isSubmitting: guided.isSubmitting, isSubmissionBlocked: !surface.canChat, providerStatus: surface.providerStatus, modelListUnavailable: surface.modelListUnavailable, showProviderStatusGate: !composerShowsSetupCard(surface), onRetryProviderStatus: surface.modelListUnavailable
                         ? surface.retryModelList
                         : surface.retryProviderStatus, ...(guided.title ? { title: guided.title } : {}), ...(guided.description ? { description: guided.description } : {}), ...(guided.skipLabel ? { skipLabel: guided.skipLabel } : {}), ...(guided.submitLabel ? { submitLabel: guided.submitLabel } : {}), className: "h-auto items-stretch justify-stretch bg-transparent" }) })) : null, suggestionBar, renderThreadSlot(surface.props.threadFooterSlot, threadId, surface.props.tabId)] }));
@@ -2452,20 +2444,28 @@ function AgentKitComposerSurface({ threadId, props, composerContext, canChat, se
                 : {}),
         };
         setComposerError(null);
+        const assertSubmissionScope = () => {
+            const latest = controller.getThread(threadId);
+            if (!mounted.current ||
+                currentSubmissionScope.current !== submissionScope ||
+                (options.suggestion &&
+                    (latest.messages.length || Object.keys(latest.runs).length) &&
+                    !isCurrentAgentSuggestion(latest, options.suggestion))) {
+                throw Object.assign(new Error(t("agentChat.composer.submissionScopeChanged")), { code: "submission_scope_changed" });
+            }
+        };
         const assertCurrentSubmission = () => {
-            if (!submissionAllowed.current ||
-                !mounted.current ||
-                currentSubmissionScope.current !== submissionScope) {
-                throw new Error(t("agentChat.error.failed"));
+            if (!submissionAllowed.current) {
+                throw Object.assign(new Error(t("agentChat.composer.submissionNotReady")), { code: "submission_not_ready" });
             }
-            const latest = controller.getThread(threadId);
-            if (options.suggestion &&
-                (latest.messages.length || Object.keys(latest.runs).length) &&
-                !isCurrentAgentSuggestion(latest, options.suggestion))
-                throw new Error(t("agentChat.error.failed"));
+            assertSubmissionScope();
         };
         assertCurrentSubmission();
-        options = { ...options, validateSubmission: assertCurrentSubmission };
+        options = {
+            ...options,
+            validateSubmission: assertCurrentSubmission,
+            validateSubmissionScope: assertSubmissionScope,
+        };
         const captured = snapshotComposerContextItems(options.contextItems ?? visibleContextItems);
         let prepared;
         await onSubmit(message, files, references, options, async () => {
@@ -2826,6 +2826,15 @@ function AgentKitRunFailure({ error, runId, threadId, }) {
     const retryRequest = retryRequestFrom(failedPrompt ?? lastUserMessage);
     const alreadyRetried = wasRetried(thread.messages, runId, failedPrompt?.id, lastUserMessage?.id);
     const retryFailedTurn = () => sendRetryRequest(surface, retryRequest, runId);
+    const retryWithoutAttachments = retryRequest.fileParts.length || retryRequest.requestAttachments.length
+        ? () => void sendRetryRequest(surface, {
+            ...retryRequest,
+            text: retryRequest.textWithContext,
+            fileParts: [],
+            requestAttachments: [],
+            hasUnavailableAttachment: false,
+        }, runId)
+        : undefined;
     const resumeAfterSetup = useResumeAfterAiSetup(`${threadId}:${(failedPrompt ?? lastUserMessage)?.id ?? runId}`, setupFailure &&
         !superseded &&
         !alreadyRetried &&
@@ -2874,7 +2883,7 @@ function AgentKitRunFailure({ error, runId, threadId, }) {
         runId,
         recoverable: error.retryable,
     };
-    return (_jsx(RunErrorRecoveryCard, { info: info, onContinue: continueStoppedRun, continueError: continueFailed ? t("agentChat.recovery.continueUnavailable") : null, onRetry: () => void retryFailedTurn(), retryHasUnavailableAttachment: retryRequest.hasUnavailableAttachment, onFork: async () => {
+    return (_jsx(RunErrorRecoveryCard, { info: info, onContinue: continueStoppedRun, continueError: continueFailed ? t("agentChat.recovery.continueUnavailable") : null, onRetry: () => void retryFailedTurn(), onRetryWithoutAttachments: retryWithoutAttachments, retryHasUnavailableAttachment: retryRequest.hasUnavailableAttachment, onFork: async () => {
             if (!lastUserMessage)
                 return surface.props.onForkChat?.();
             const fork = await control.fork(lastUserMessage.id);
@@ -2932,6 +2941,7 @@ function retryRequestFrom(message) {
     const requestMode = mode === "plan" || mode === "act" ? mode : undefined;
     return {
         text: message ? agentMessageText(message) : "",
+        textWithContext: message ? rawAgentMessageText(message) : "",
         fileParts,
         requestAttachments: retryRequestAttachmentsFrom(custom?.agentNativeRetryRequestAttachments),
         hasUnavailableAttachment: custom?.agentNativeRetryAttachmentsUnavailable === true ||
@@ -3272,6 +3282,47 @@ function setupSubmissionResult(error) {
             : "submission-unavailable",
     };
 }
+/** The `/_agent-native/file-upload` ceiling (core's `DEFAULT_UPLOAD_MAX_FILE_BYTES`). */
+const AGENT_CHAT_UPLOAD_MAX_FILE_BYTES = 25 * 1024 * 1024;
+function uploadTooLargeMessage(t) {
+    return t("agentChat.composer.fileTooLarge", {
+        size: AGENT_CHAT_UPLOAD_MAX_FILE_BYTES / 1024 / 1024,
+    });
+}
+function uploadHttpError(status, t) {
+    const [code, message, retryable] = status === 413
+        ? ["upload_too_large", uploadTooLargeMessage(t), false]
+        : status === 401 || status === 403
+            ? [
+                "upload_session_expired",
+                t("agentChat.composer.sessionExpired"),
+                false,
+            ]
+            : status === 415
+                ? [
+                    "upload_unsupported_type",
+                    t("agentChat.composer.unsupportedFileType"),
+                    false,
+                ]
+                : status === 408 || status === 429 || status >= 500
+                    ? [
+                        "upload_unavailable",
+                        t("agentChat.composer.uploadUnavailable"),
+                        true,
+                    ]
+                    : [
+                        `upload_http_${status}`,
+                        t("agentChat.composer.uploadFailed"),
+                        false,
+                    ];
+    return Object.assign(new Error(message), { code, status, retryable });
+}
+/**
+ * Durable uploads keyed by the attachment or file they came from, so a send
+ * that failed on one file reuses its siblings' uploads instead of orphaning
+ * them and uploading again.
+ */
+const uploadedAgentChatSources = new WeakMap();
 const OPTIMIZABLE_RASTER_IMAGE_TYPES = new Set([
     "image/gif",
     "image/jpeg",
@@ -3307,6 +3358,7 @@ function requiresDurableAttachmentUpload(attachments, files) {
 }
 async function uploadAgentChatAttachments(control, attachments, files, options) {
     const entries = [];
+    const sourceByFile = new Map();
     for (const attachment of attachments) {
         if (attachment.displayOnly)
             continue;
@@ -3321,12 +3373,15 @@ async function uploadAgentChatAttachments(control, attachments, files, options)
         }
         else {
             const file = await attachmentToFile(attachment);
-            if (file)
+            if (file) {
                 entries.push(file);
+                sourceByFile.set(file, attachment);
+            }
         }
     }
     entries.push(...files);
     const pending = entries.filter((entry) => entry instanceof File);
+    const sourceOf = (file) => sourceByFile.get(file) ?? file;
     const optimizedImages = new Map();
     for (const file of pending) {
         if (!file.type.startsWith("image/") ||
@@ -3349,24 +3404,59 @@ async function uploadAgentChatAttachments(control, attachments, files, options)
     if (!options.storageConfigured && filesToUploadNormally.length > 0) {
         throw new Error(options.storageUnavailableMessage);
     }
-    if (filesToUploadNormally.length) {
-        const uploaded = await control.uploadFiles(filesToUploadNormally.map((file) => ({
-            name: file.name,
-            mediaType: file.type || "application/octet-stream",
-            size: file.size,
-            body: file,
-        })));
-        filesToUploadNormally.forEach((file, index) => {
+    const oversized = filesToUploadNormally.flatMap((file, index) => file.size > AGENT_CHAT_UPLOAD_MAX_FILE_BYTES
+        ? [
+            {
+                index,
+                name: file.name,
+                error: Object.assign(new Error(options.fileTooLargeMessage), {
+                    code: "upload_too_large",
+                    retryable: false,
+                }),
+            },
+        ]
+        : []);
+    if (oversized.length)
+        throw new AgentKitUploadError(oversized, []);
+    const filesToUpload = filesToUploadNormally.filter((file) => {
+        const reused = uploadedAgentChatSources.get(sourceOf(file));
+        if (reused)
+            uploadedByFile.set(file, reused);
+        return !reused;
+    });
+    if (filesToUpload.length) {
+        let uploaded;
+        try {
+            uploaded = await control.uploadFiles(filesToUpload.map((file) => ({
+                name: file.name,
+                mediaType: file.type || "application/octet-stream",
+                size: file.size,
+                body: file,
+            })));
+        }
+        catch (error) {
+            if (error instanceof AgentKitUploadError) {
+                for (const { index, part } of error.uploaded) {
+                    uploadedAgentChatSources.set(sourceOf(filesToUpload[index]), part);
+                }
+            }
+            throw error;
+        }
+        filesToUpload.forEach((file, index) => {
             const part = uploaded[index];
             if (!part) {
                 throw new TypeError("File upload did not return every uploaded file.");
             }
             uploadedByFile.set(file, part);
+            uploadedAgentChatSources.set(sourceOf(file), part);
         });
     }
     for (const file of pending) {
-        if (!optimizedImages.has(file) || !options.storageConfigured)
+        if (!optimizedImages.has(file) ||
+            !options.storageConfigured ||
+            file.size > AGENT_CHAT_UPLOAD_MAX_FILE_BYTES) {
             continue;
+        }
         try {
             const [part] = await control.uploadFiles([
                 {
@@ -3439,6 +3529,34 @@ async function uploadRequestAttachments(control, attachments) {
         return { ...reference, url: part.url };
     });
 }
+/** Stored submissions carry durable references, so inline file bytes upload first. */
+async function durableFileParts(control, parts, options) {
+    const inline = parts.filter((part) => isInlineDataUrl(part.url));
+    if (inline.length === 0)
+        return [...parts];
+    if (!options.storageConfigured) {
+        throw new Error(options.storageUnavailableMessage);
+    }
+    const uploaded = await control.uploadFiles(await Promise.all(inline.map(async (part) => {
+        const body = await (await fetch(part.url)).blob();
+        return {
+            name: part.name,
+            mediaType: part.mediaType ?? (body.type || "application/octet-stream"),
+            size: body.size,
+            body,
+        };
+    })));
+    let uploadIndex = 0;
+    return parts.map((part) => {
+        if (!isInlineDataUrl(part.url))
+            return part;
+        const durable = uploaded[uploadIndex++];
+        if (!durable?.url && !durable?.fileId) {
+            throw new TypeError(`${part.name} did not receive a durable reference.`);
+        }
+        return durable;
+    });
+}
 function rawAgentMessageTextFromParts(parts) {
     return parts
         .filter((part) => part.type === "text")
@@ -3454,21 +3572,47 @@ function rawAgentMessageText(message) {
 function agentMessageText(message) {
     return agentMessageTextFromParts(message.parts);
 }
+/**
+ * The live message keeps inline image bytes for display; what is stored keeps
+ * only a durable reference, or a named `omitted` marker when there is none.
+ */
 function persistedAgentMessage(message) {
     return {
         ...message,
         parts: message.parts.map((part) => {
             const record = asRecord(part);
-            if ((record?.type === "file" || record?.type === "image") &&
-                typeof record.data === "string" &&
-                record.data.startsWith("data:")) {
-                const { data: _data, ...withoutInlineBody } = record;
-                return withoutInlineBody;
+            if (!record ||
+                (!isInlineDataUrl(record.data) && !isInlineDataUrl(record.url))) {
+                return part;
             }
-            return part;
+            const { data: _data, url, ...rest } = record;
+            const durableUrl = isInlineDataUrl(url) ? undefined : url;
+            return {
+                ...rest,
+                ...(durableUrl ? { url: durableUrl } : {}),
+                ...(durableUrl || rest.fileId ? {} : { omitted: "inline-bytes" }),
+            };
         }),
     };
 }
+function persistedAgentEvent(event) {
+    return "message" in event && event.message
+        ? { ...event, message: persistedAgentMessage(event.message) }
+        : event;
+}
+function persistedQueuedMessage(message) {
+    return {
+        ...message,
+        ...(message.attachments
+            ? { attachments: message.attachments.map(persistableFilePart) }
+            : {}),
+        ...(message.requestAttachments
+            ? {
+                requestAttachments: message.requestAttachments.flatMap(({ data: _data, ...reference }) => reference.url ? [reference] : []),
+            }
+            : {}),
+    };
+}
 function createAgentKitThreadSnapshot(thread) {
     const messages = thread.messages.map(persistedAgentMessage);
     const repositoryMessages = messages.map((message, index) => ({
@@ -3501,7 +3645,7 @@ function createAgentKitThreadSnapshot(thread) {
     }));
     const agentKit = {
         messages,
-        events: thread.events,
+        events: thread.events.map(persistedAgentEvent),
         runs,
         activeRunIds: thread.activeRunIds,
         toolCalls: Object.values(thread.tools),
@@ -3511,7 +3655,7 @@ function createAgentKitThreadSnapshot(thread) {
         threadData: JSON.stringify({
             headId: messages.at(-1)?.id ?? null,
             messages: repositoryMessages,
-            queuedMessages: thread.queuedMessages,
+            queuedMessages: thread.queuedMessages.map(persistedQueuedMessage),
             agentKit,
         }),
         title,
@@ -3569,8 +3713,8 @@ function storeAgentKitThreadHandoffSnapshot(key, thread, snapshot) {
         createdAt: thread.thread?.createdAt ?? messages[0]?.createdAt ?? now,
         updatedAt: thread.thread?.updatedAt ?? messages.at(-1)?.createdAt ?? now,
         messages,
-        queuedMessages: thread.queuedMessages,
-        events: thread.events,
+        queuedMessages: thread.queuedMessages.map(persistedQueuedMessage),
+        events: thread.events.map(persistedAgentEvent),
         runs: Object.entries(thread.runs).map(([id, run]) => ({
             ...run,
             id,