@agent-native/toolkit 0.198.8 → 0.199.0-nightly-20261001064935

package/dist/app/chat/AgentKitAssistantChat.js

@@ -1,5 +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 { CHATGPT_SUBSCRIPTION_ENGINE_NAME } from "@agent-native/core/agent/chatgpt-subscription-contract";
 import { appendAgentChatContextToMessage, filterAgentChatContextItems, formatAgentChatContextItemsForPrompt, getAgentChatContextState, normalizeAgentChatContextItem, publishAgentChatContextItems, reportAgentChatSubmitResult, refreshAgentChatContext, subscribeAgentChatContext, } from "@agent-native/core/client/agent-chat";
 import { AGENT_NATIVE_PROTOCOL_METADATA_KEY } from "@agent-native/core/client/agent-chat";
 import { readAssistantChatComposerDraft, writeAssistantChatComposerDraft, } from "@agent-native/core/client/agent-chat";
@@ -1395,14 +1396,16 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                     const currentPendingSelection = pendingSelectionRef.current;
                     const selectionRevision = selectionRevisionRef.current;
                     const attachments = options.attachments ?? [];
-                    const needsFileStorage = files.length > 0 ||
-                        attachments.some((attachment) => !attachment.displayOnly && !attachment.url);
+                    const needsFileStorage = !options.deferredFileParts &&
+                        (files.length > 0 ||
+                            attachments.some((attachment) => !attachment.displayOnly && !attachment.url));
                     if (needsFileStorage && !fileStorageConfigured) {
                         throw new Error(t("onboarding.fileStorage.title"));
                     }
                     // Persist only URLs or opaque file handles; application_state is
                     // not a file store and must never receive attachment bodies.
-                    const fileParts = await uploadAgentChatAttachments(control, attachments, files);
+                    const fileParts = options.deferredFileParts ??
+                        (await uploadAgentChatAttachments(control, attachments, files));
                     const selectionChangedDuringUpload = selectionRevision !== selectionRevisionRef.current;
                     const context = options.recoveryAction
                         ? ""
@@ -1737,17 +1740,18 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
             })),
         ],
     }), [isThreadRunning, submit]);
-    const sendRecoveryMessage = useCallback(async (text, recoveryAction, images, attachments, references, recoveryOptions) => {
+    const sendRecoveryMessage = useCallback(async (text, recoveryAction, images, fileParts, references, recoveryOptions) => {
         return submit(text, [], [], { intent: isThreadRunning() ? "queued" : "immediate" }, {
             hideUserMessage: true,
             recoveryAction,
             recoveryReferences: references,
             ...recoveryOptions,
-            attachments: [
-                ...(attachments ?? []),
+            deferredFileParts: [
+                ...(fileParts ?? []),
                 ...(images ?? []).map((url) => ({
-                    type: "image",
+                    type: "file",
                     name: "image",
+                    mediaType: "image",
                     url,
                 })),
             ],
@@ -2081,7 +2085,7 @@ 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, 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: "agent-thinking-indicator", role: "status", "aria-live": "polite", children: _jsx("span", { className: "agent-thinking-indicator__text", children: t("agentChat.status.thinking") }) })) : null, 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, onRetryProviderStatus: 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)] }));
+                            : 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, 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, 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, onRetryProviderStatus: 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)] }));
 }
 function renderThreadSlot(slot, threadId, tabId) {
     return typeof slot === "function"
@@ -2328,7 +2332,7 @@ function AgentKitComposerSurface({ threadId, props, composerContext, canChat, se
                                 composerContext?.onRemoveContextItem(key);
                             else
                                 onRemoveContextItem(key);
-                        }, onRetryContextItem: composerContext?.onRetryContextItem, onInspectContextItem: composerContext?.onInspectContextItem, interceptBuildRequestsForBuilder: isInBuilderFrame(), selectedModel: props.selectedModel ?? props.defaultModel, selectedEngine: props.selectedEngine, selectedEffort: props.selectedEffort, availableModels: props.availableModels, modelListLoading: props.modelListLoading, onModelChange: props.onModelChange, onEffortChange: props.onEffortChange, availableAgents: props.availableAgents, selectedAgent: props.selectedAgent, agentOnly: props.hostedHarness, onAgentChange: props.onAgentChange, showModelSelector: props.showModelSelector, mode: props.execMode === "plan" ? "plan" : "act", planModeDisabled: props.planModeDisabled, planModeDisabledReason: props.planModeDisabledReason, onModeChange: (mode) => props.onExecModeChange?.(mode === "plan" ? "plan" : "build"), layoutVariant: props.composerLayoutVariant, plusMenuMode: props.plusMenuMode, placeholder: composerPlaceholder({
+                        }, onRetryContextItem: composerContext?.onRetryContextItem, interceptBuildRequestsForBuilder: isInBuilderFrame(), selectedModel: props.selectedModel ?? props.defaultModel, selectedEngine: props.selectedEngine, selectedEffort: props.selectedEffort, availableModels: props.availableModels, modelListLoading: props.modelListLoading, onModelChange: props.onModelChange, onEffortChange: props.onEffortChange, availableAgents: props.availableAgents, selectedAgent: props.selectedAgent, agentOnly: props.hostedHarness, onAgentChange: props.onAgentChange, showModelSelector: props.showModelSelector, mode: props.execMode === "plan" ? "plan" : "act", planModeDisabled: props.planModeDisabled, planModeDisabledReason: props.planModeDisabledReason, onModeChange: (mode) => props.onExecModeChange?.(mode === "plan" ? "plan" : "build"), layoutVariant: props.composerLayoutVariant, plusMenuMode: props.plusMenuMode, placeholder: composerPlaceholder({
                             props,
                             canChat,
                             providerStatus,
@@ -2336,7 +2340,7 @@ function AgentKitComposerSurface({ threadId, props, composerContext, canChat, se
                             isRunning,
                             thread,
                             t,
-                        }), onConnectProvider: props.onConnectProvider, onConnectLocalRuntime: props.onConnectLocalRuntime, imageModelMenu: props.imageModelMenu, voiceEnabled: true, toolbarSlot: props.composerToolbarSlot, extraActionButton: props.composerExtraActionButton, includeDefaultSlashCommands: true, includeDefaultSlashSkills: true, onSlashCommand: props.onSlashCommand, modelStatusChecksEnabled: props.showModelSelector !== false &&
+                        }), onConnectProvider: props.onConnectProvider, onConnectLocalRuntime: props.onConnectLocalRuntime, imageModelMenu: props.imageModelMenu, voiceEnabled: true, toolbarSlot: _jsxs(_Fragment, { children: [props.selectedEngine === CHATGPT_SUBSCRIPTION_ENGINE_NAME ? (_jsxs("span", { className: "inline-flex items-center gap-2 text-[11px] text-muted-foreground", children: [_jsx("span", { children: t("agentChat.composer.chatgptPlanUsing") }), _jsx("a", { href: "https://chatgpt.com/settings/usage", target: "_blank", rel: "noreferrer", className: "font-medium text-foreground underline-offset-2 hover:underline", children: t("agentChat.composer.chatgptManageUsage") })] })) : null, props.composerToolbarSlot] }), extraActionButton: props.composerExtraActionButton, includeDefaultSlashCommands: true, includeDefaultSlashSkills: true, onSlashCommand: props.onSlashCommand, modelStatusChecksEnabled: props.showModelSelector !== false &&
                             props.availableModels === undefined, attachmentsEnabled: fileStorageConfigured, onAttachmentRequest: requestFileStorage, contextButtonTooltipDisabled: fileStoragePromptOpen, onAttachmentError: setComposerError, onSubmit: submitComposer, composerRef: composerRef, stopButton: isRunning ? (_jsx("button", { type: "button", onClick: () => {
                                 setComposerError(null);
                                 void (async () => {
@@ -2419,13 +2423,19 @@ function AgentKitTool({ value, active }) {
     const surface = useAgentKitSurface();
     const metadata = value.metadata ?? {};
     const input = asRecord(value.input) ?? {};
-    const output = value.status === "failed" && value.error?.message
-        ? value.error.message
-        : typeof value.output === "string"
+    const errorOutput = value.status === "failed"
+        ? Array.from(new Set([
+            value.error?.message?.trim(),
+            formatErrorDetails(value.error?.details),
+            formatErrorDetails(value.output),
+        ].filter((detail) => Boolean(detail?.trim())))).join("\n\n") || undefined
+        : undefined;
+    const output = errorOutput ??
+        (typeof value.output === "string"
             ? value.output
             : value.output === undefined
                 ? undefined
-                : JSON.stringify(value.output);
+                : JSON.stringify(value.output));
     return (_jsx(ChatRunningContext.Provider, { value: active === true || value.status === "running", children: _jsx(SuppressInlineOpenAppContext.Provider, { value: surface.props.suppressInlineOpenApp === true, children: _jsx(ToolCallDisplay, { toolName: value.name, toolCallId: value.id, args: input, argsText: JSON.stringify(input), result: output, isError: value.status === "failed", isRunning: value.status === "running", structuredMeta: metadata, mcpApp: asRecord(metadata.mcpApp), chatUI: asRecord(metadata.chatUI), activity: metadata.activity === true, isActiveTail: active === true }) }) }));
 }
 function AgentKitApproval({ value, runId, }) {
@@ -2560,28 +2570,20 @@ function AgentKitRunFailure({ error, runId, threadId, }) {
         const value = retryMetadata?.[key] ?? retryCustomMetadata?.[key];
         return typeof value === "string" && value.trim() ? value : undefined;
     };
-    const retryAttachments = lastUserMessage?.parts.flatMap((part) => part.type === "file"
-        ? [
-            {
-                type: "file",
-                name: part.name,
-                ...(part.mediaType ? { contentType: part.mediaType } : {}),
-                ...(part.url ? { url: part.url } : {}),
-            },
-        ]
-        : []) ?? [];
+    const retryFileParts = lastUserMessage?.parts.filter((part) => part.type === "file") ?? [];
+    const retryHasUnavailableAttachment = retryFileParts.some((part) => !part.url && !part.fileId);
     const retryReferences = Array.isArray(retryMetadata?.references)
         ? retryMetadata.references
         : [];
     const retryRequestMode = metadataString("requestMode");
-    return (_jsx(RunErrorRecoveryCard, { info: info, onContinue: () => void surface.sendRecoveryMessage(RECOVERY_CONTINUE_PROMPT, "continue"), onRetry: () => void surface.sendRecoveryMessage(retryText || "Please retry the last request.", "retry", undefined, retryAttachments, retryReferences, {
+    return (_jsx(RunErrorRecoveryCard, { info: info, onContinue: () => void surface.sendRecoveryMessage(RECOVERY_CONTINUE_PROMPT, "continue"), onRetry: () => void surface.sendRecoveryMessage(retryText || "Please retry the last request.", "retry", undefined, retryFileParts, retryReferences, {
             recoveryModel: metadataString("model"),
             recoveryEngine: metadataString("engine"),
             recoveryEffort: metadataString("effort"),
             ...(retryRequestMode === "plan" || retryRequestMode === "act"
                 ? { recoveryRequestMode: retryRequestMode }
                 : {}),
-        }), onFork: async () => {
+        }), retryHasUnavailableAttachment: retryHasUnavailableAttachment, onFork: async () => {
             if (!lastUserMessage)
                 return surface.props.onForkChat?.();
             const fork = await control.fork(lastUserMessage.id);
@@ -2591,7 +2593,12 @@ function AgentKitRunFailure({ error, runId, threadId, }) {
 }
 function AgentKitConnectionError({ error, threadId, recover, recovering, recoveryError, }) {
     const t = useT();
-    return (_jsxs("div", { className: "rounded-md border border-border px-3 py-2 text-xs text-muted-foreground", "data-error-code": error.code, "data-thread-id": threadId, role: "alert", children: [_jsx("strong", { className: "mr-2 font-medium text-foreground", children: t("agentChat.error.failed") }), _jsx("span", { children: formatAgentKitErrorText(error, t) }), error.retryable ? (_jsx("button", { type: "button", disabled: recovering, onClick: () => void recover().catch(() => undefined), className: "ml-3 rounded px-2 py-1 hover:bg-accent hover:text-foreground disabled:opacity-60", children: recovering
+    const surface = useAgentKitSurface();
+    const chatGPTPlanUsageError = surface.props.selectedEngine === CHATGPT_SUBSCRIPTION_ENGINE_NAME &&
+        `${error.code} ${error.message}`.match(/subscription_sharing_usage_limit_(exceeded|unavailable)/)?.[1];
+    return (_jsxs("div", { className: "rounded-md border border-border px-3 py-2 text-xs text-muted-foreground", "data-error-code": error.code, "data-thread-id": threadId, role: "alert", children: [_jsx("strong", { className: "mr-2 font-medium text-foreground", children: t("agentChat.error.failed") }), chatGPTPlanUsageError ? (_jsxs(_Fragment, { children: [_jsx("span", { children: t(chatGPTPlanUsageError === "exceeded"
+                            ? "agentChat.error.chatgptPlanUsageLimit"
+                            : "agentChat.error.chatgptPlanUsageUnavailable") }), _jsx("a", { href: "https://chatgpt.com/settings/usage", target: "_blank", rel: "noreferrer", className: "ml-3 font-medium text-foreground underline-offset-2 hover:underline", children: t("agentChat.composer.chatgptManageUsage") })] })) : (_jsx("span", { children: formatAgentKitErrorText(error, t) })), error.retryable ? (_jsx("button", { type: "button", disabled: recovering, onClick: () => void recover().catch(() => undefined), className: "ml-3 rounded px-2 py-1 hover:bg-accent hover:text-foreground disabled:opacity-60", children: recovering
                     ? t("agentChat.common.loading")
                     : t("agentChat.agentPanel.chatgptSubscriptionReconnect") })) : null, recoveryError ? (_jsx("span", { className: "mt-2 block", role: "alert", children: formatAgentKitErrorText({ code: "runtime_error", message: recoveryError.message }, t) })) : null] }));
 }