@agent-native/toolkit 0.198.3 → 0.198.4

package/dist/app/chat/AgentKitAssistantChat.js

@@ -187,6 +187,11 @@ function isRetryableDeferredProviderSubmissionError(error) {
     }
     return error instanceof TypeError || record?.name === "AbortError";
 }
+function preserveQueuedIntent(preparedOptions, originalOptions) {
+    return originalOptions.intent === "queued"
+        ? { ...preparedOptions, intent: "queued" }
+        : preparedOptions;
+}
 function captureQueuedRunState(options, runWasActive) {
     return {
         ...options,
@@ -239,7 +244,9 @@ export const AgentKitAssistantChat = forwardRef(function AgentKitAssistantChat(p
     const handoffSnapshot = props.createTransport || props.runtime
         ? null
         : readAgentKitThreadHandoffSnapshot(createAgentKitThreadHandoffKey(props, threadId));
-    const [threadRestore, setThreadRestore] = useState(() => props.isThreadStateLoading || !props.isNewThread
+    const [manualLoadThreadId, setManualLoadThreadId] = useState(() => (props.isNewThread ? threadId : null));
+    const hasManualLoadForCurrentThread = props.isNewThread || manualLoadThreadId === threadId;
+    const [threadRestore, setThreadRestore] = useState(() => props.isThreadStateLoading || !hasManualLoadForCurrentThread
         ? { status: "loading" }
         : { status: "ready" });
     const [restoreRetryLoadPhase, setRestoreRetryLoadPhase] = useState("idle");
@@ -251,12 +258,20 @@ export const AgentKitAssistantChat = forwardRef(function AgentKitAssistantChat(p
         setRestoreRetryThreadId(null);
     }, []);
     useEffect(() => {
-        setThreadRestore(props.isThreadStateLoading || !props.isNewThread
+        setManualLoadThreadId((current) => props.isNewThread ? threadId : current === threadId ? current : null);
+    }, [props.isNewThread, threadId]);
+    useEffect(() => {
+        setThreadRestore(props.isThreadStateLoading || !hasManualLoadForCurrentThread
             ? { status: "loading" }
             : { status: "ready" });
         setRestoreRetryLoadPhase("idle");
         setRestoreRetryThreadId(null);
-    }, [props.isNewThread, props.isThreadStateLoading, threadId]);
+    }, [
+        hasManualLoadForCurrentThread,
+        props.isNewThread,
+        props.isThreadStateLoading,
+        threadId,
+    ]);
     const onThreadRestoreLoadError = useCallback((error) => {
         const record = asRecord(error);
         const response = asRecord(record?.response);
@@ -594,7 +609,7 @@ export const AgentKitAssistantChat = forwardRef(function AgentKitAssistantChat(p
         props.createTransport ? threadId : undefined,
     ]);
     const agentKitLoad = props.isThreadStateLoading ||
-        props.isNewThread ||
+        hasManualLoadForCurrentThread ||
         (restoreRetryThreadId === threadId && restoreRetryLoadPhase === "release")
         ? "manual"
         : "auto";
@@ -1490,7 +1505,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
                 !props.composerSubmissionDisabled) {
                 try {
                     const preparedOptions = prepare ? await prepare() : composerOptions;
-                    const submittedOptions = captureQueuedRunState(preparedOptions, runWasActiveAtSubmit);
+                    const submittedOptions = captureQueuedRunState(preserveQueuedIntent(preparedOptions, composerOptions), runWasActiveAtSubmit);
                     const result = await submit(text, files, references, submittedOptions);
                     if (result.status === "rejected") {
                         throw new Error(t("agentChat.recovery.deferredSubmissionFailed"));
@@ -1508,7 +1523,7 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
         }
         try {
             const preparedOptions = prepare ? await prepare() : composerOptions;
-            await dispatch(text, files, references, captureQueuedRunState(preparedOptions, runWasActiveAtSubmit));
+            await dispatch(text, files, references, captureQueuedRunState(preserveQueuedIntent(preparedOptions, composerOptions), runWasActiveAtSubmit));
         }
         catch (error) {
             dispatchSetupRequiredEvent(error, props.tabId, threadId);
@@ -1733,12 +1748,20 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
             ],
         });
     }, [isThreadRunning, submit]);
-    const resumeIntegrationPrompt = useCallback((message) => {
-        if (props.isActiveComposer === false)
-            return;
-        void send(message).catch((error) => {
+    const resumeIntegrationPrompt = useCallback(async (message) => {
+        if (props.isActiveComposer === false) {
+            throw new Error("Cannot resume a request in an inactive chat.");
+        }
+        try {
+            const result = await send(message);
+            if (result.status === "rejected") {
+                throw new Error(`Chat resume was rejected: ${result.reason}.`);
+            }
+        }
+        catch (error) {
             dispatchSetupRequiredEvent(error, props.tabId, threadId);
-        });
+            throw error;
+        }
     }, [props.isActiveComposer, props.tabId, send, threadId]);
     const submitSuggestion = useCallback((suggestion) => {
         const handler = suggestionSubmitRef.current;
@@ -1899,16 +1922,15 @@ const AgentKitAssistantChatBody = forwardRef(function AgentKitAssistantChatBody(
         onImplementPlan: implementPlan,
     };
     return (_jsxs(AgentKitSurfaceContext.Provider, { value: surfaceContext, children: [props.isActiveComposer === false ? null : (_jsx(McpAgentKitConnectionResume, { onResume: ({ threadId: targetThreadId, runId, requestId }, request) => {
-                    if (targetThreadId !== threadId)
-                        return;
+                    if (targetThreadId !== threadId) {
+                        throw new Error("Cannot resume a connection request in another chat.");
+                    }
                     return control.resolveConnectionRequest(runId, requestId, {
                         status: "connected",
                         message: request.message,
                     });
-                }, onMessageResume: (request) => {
-                    resumeIntegrationPrompt(request.message);
-                } })), _jsx(RunStuckBanner, { threadId: threadId, enabled: props.isActiveComposer !== false, apiUrl: props.apiUrl ?? agentNativePath("/_agent-native/agent-chat"), autoRetry: true, autoRetryOwnerId: props.browserTabId, hasInFlightWork: () => Object.values(thread.tools).some((tool) => tool.status === "running") ||
-                    Object.values(thread.activities).some((activity) => activity.status === "running"), isAwaitingResponse: () => isRunning, onRetry: () => void sendRecoveryMessage(RECOVERY_CONTINUE_PROMPT, "continue") }), _jsx(AgentKitChat, { className: props.className, composerProps: { attachmentsEnabled: fileStorageConfigured }, hasRenderedMessages: hasRenderedMessages, emptyComposerPlacement: props.centerComposerWhenEmpty ? "center" : "bottom", title: props.showHeader === false ? undefined : props.emptyStateText, autoScroll: true })] }));
+                }, onMessageResume: (request) => resumeIntegrationPrompt(request.message) })), _jsx(RunStuckBanner, { threadId: threadId, enabled: props.isActiveComposer !== false, apiUrl: props.apiUrl ?? agentNativePath("/_agent-native/agent-chat"), autoRetry: true, autoRetryOwnerId: props.browserTabId, hasInFlightWork: () => Object.values(thread.tools).some((tool) => tool.status === "running") ||
+                    Object.values(thread.activities).some((activity) => activity.status === "running"), isAwaitingResponse: () => isRunning, onRetry: () => void sendRecoveryMessage(RECOVERY_CONTINUE_PROMPT, "continue") }), history?.historyLoadFailed ? (_jsxs("div", { role: "alert", className: "mx-3 mb-2 flex items-center justify-between gap-3 rounded-md border border-border px-3 py-2 text-xs", children: [_jsx("span", { className: "text-muted-foreground", children: t("agentChat.message.historyUnavailable") }), _jsx("button", { type: "button", onClick: history.retryHistory, disabled: history.isRetryingHistory, className: "shrink-0 font-medium text-foreground hover:underline disabled:cursor-not-allowed disabled:opacity-50", children: t("agentChat.common.retry") })] })) : null, _jsx(AgentKitChat, { className: props.className, composerProps: { attachmentsEnabled: fileStorageConfigured }, hasRenderedMessages: hasRenderedMessages, emptyComposerPlacement: props.centerComposerWhenEmpty ? "center" : "bottom", title: props.showHeader === false ? undefined : props.emptyStateText, autoScroll: true })] }));
 });
 function AgentKitComposerSlot({ threadId }) {
     const surface = useAgentKitSurface();
@@ -2278,9 +2300,9 @@ function AgentKitComposerSurface({ threadId, props, composerContext, canChat, se
                     props.composerSubmissionDisabled ||
                     isSubmissionInFlight, onSelect: submitSuggestion, className: "agentkit-home-suggestions" })) : null, showPlanCallout ? (_jsx(PlanModeCallout, { canImplementPlan: latestAssistantWasPlan, onImplementPlan: onImplementPlan, onSwitchToAct: () => props.onExecModeChange?.("build") })) : null, setupMissing && props.showMissingApiKeySetup !== false ? (_jsx(BuilderSetupCard, { fullWidth: true, attached: true, bouncePulse: setupBouncePulse, layout: props.missingApiKeySetupLayout ?? "default", onConnected: () => window.dispatchEvent(new Event("agent-engine:configured-changed")) })) : null, !canChat && !setupMissing && providerStatus !== "configured" ? (_jsx(GuidedQuestionProviderGate, { providerStatus: providerStatus, onRetry: retryProviderStatus })) : null, integration ? (_jsx(McpConnectionSuggestion, { text: text, variant: "composer", requestedByUser: true, integrationId: integration.id })) : null, selectionLength !== null && selectionLength > 0 ? (_jsx(AgentKitSelectionPill, { length: selectionLength, onClear: onClearSelection })) : null, _jsxs("div", { className: "relative", children: [_jsx(AgentKitComposer, { threadId: threadId, disabled: (!canChat && !providerSubmissionPending) ||
                             props.composerDisabled ||
-                            isRestoring ||
-                            isSubmissionInFlight, submissionDisabled: (!canChat && !providerSubmissionPending) ||
-                            props.composerSubmissionDisabled === true, onDisabledClick: props.composerDisabled || !setupMissing
+                            isRestoring, submissionDisabled: (!canChat && !providerSubmissionPending) ||
+                            props.composerSubmissionDisabled === true ||
+                            isSubmissionInFlight, onDisabledClick: props.composerDisabled || !setupMissing
                             ? undefined
                             : () => {
                                 bounceSetupCard();
@@ -2460,7 +2482,7 @@ function AgentKitReasoning({ value, active, resetKey, }) {
 }
 function AgentKitConnectionRequest({ value, runId, threadId, }) {
     const control = useAgentKitControl();
-    return (_jsx(McpAgentKitConnectionRequestCard, { provider: value.provider, detail: value.detail, target: { threadId, runId, requestId: value.id }, onConnected: () => control.resolveConnectionRequest(runId, value.id, {
+    return (_jsx(McpAgentKitConnectionRequestCard, { provider: value.provider, detail: value.detail, reason: value.reason, status: value.status, appId: value.appId, source: value.source, target: { threadId, runId, requestId: value.id }, onConnected: () => control.resolveConnectionRequest(runId, value.id, {
             status: "connected",
         }), onDeclined: () => control.resolveConnectionRequest(runId, value.id, {
             status: "declined",