AutoGPT is the vision of accessible AI for everyone, to use and to build on. Our mission is to provide the tools, so that you can focus on what matters.
feat(frontend): design updates run agent modal (#11570)
Ubbeaaa8dcc5a846
diff --git a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.tsindex f6df869350..df1de26300 100644--- a/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts+++ b/autogpt_platform/frontend/src/app/(platform)/auth/integrations/oauth_callback/route.ts@@ -1,4 +1,4 @@-import { OAuthPopupResultMessage } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";+import { OAuthPopupResultMessage } from "@/components/renderers/input-renderer/fields/CredentialField/models/OAuthCredentialModal/useOAuthCredentialModal";import { NextResponse } from "next/server";// This route is intended to be used as the callback for integration OAuth flows,diff --git a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsxindex 0f3a7dadfc..1f70f7740f 100644--- a/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/chat/components/ChatCredentialsSetup/ChatCredentialsSetup.tsx@@ -141,7 +141,6 @@ export function ChatCredentialsSetup({onSelectCredentials={(credMeta) =>handleCredentialSelect(cred.provider, credMeta)}- hideIfSingleCredentialAvailable={false}/></div>);diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsxindex 1f59479208..d46a6bfc9e 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/AgentInputsReadOnly/AgentInputsReadOnly.tsx@@ -1,13 +1,11 @@"use client";-import React from "react";import type { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";import type { CredentialsMetaInput } from "@/lib/autogpt-server-api/types";-import { toDisplayName } from "@/providers/agent-credentials/helper";+import { CredentialsInput } from "../CredentialsInputs/CredentialsInputs";import {getAgentCredentialsFields,getAgentInputFields,- getCredentialTypeDisplayName,renderValue,} from "./helpers";@@ -54,32 +52,18 @@ export function AgentInputsReadOnly({{hasCredentials && (<div className="flex flex-col gap-6">{hasInputs && <div className="border-t border-neutral-200 pt-4" />}- {credentialEntries.map(([key, _sub]) => {+ {credentialEntries.map(([key, inputSubSchema]) => {const credential = credentialInputs![key];if (!credential) return null;return (- <div key={key} className="flex flex-col gap-4">- <h3 className="text-lg font-medium text-neutral-900">- {toDisplayName(credential.provider)} credentials- </h3>- <div className="flex flex-col gap-3">- <div className="flex items-center justify-between text-sm">- <span className="text-neutral-600">Name</span>- <span className="text-neutral-600">- {getCredentialTypeDisplayName(credential.type)}- </span>- </div>- <div className="flex items-center justify-between text-sm">- <span className="text-neutral-900">- {credential.title || "Untitled"}- </span>- <span className="font-mono text-neutral-400">- {"*".repeat(25)}- </span>- </div>- </div>- </div>+ <CredentialsInput+ key={key}+ schema={{ ...inputSubSchema, discriminator: undefined } as any}+ selectedCredentials={credential}+ onSelectCredentials={() => {}}+ readOnly={true}+ />);})}</div>diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsxindex c58b2f01a7..e63105c751 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs.tsx@@ -1,189 +1,59 @@-import {- IconKey,- IconKeyPlus,- IconUserPlus,-} from "@/components/__legacy__/ui/icons";-import {- Select,- SelectContent,- SelectItem,- SelectSeparator,- SelectTrigger,- SelectValue,-} from "@/components/__legacy__/ui/select";import { Button } from "@/components/atoms/Button/Button";+import { Text } from "@/components/atoms/Text/Text";import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";-import useCredentials from "@/hooks/useCredentials";-import { useBackendAPI } from "@/lib/autogpt-server-api/context";import {BlockIOCredentialsSubSchema,CredentialsMetaInput,} from "@/lib/autogpt-server-api/types";import { cn } from "@/lib/utils";-import { getHostFromUrl } from "@/lib/utils/url";-import { NotionLogoIcon } from "@radix-ui/react-icons";-import { FC, useEffect, useMemo, useState } from "react";-import {- FaDiscord,- FaGithub,- FaGoogle,- FaHubspot,- FaKey,- FaMedium,- FaTwitter,-} from "react-icons/fa";-import { APIKeyCredentialsModal } from "./APIKeyCredentialsModal/APIKeyCredentialsModal";-import { HostScopedCredentialsModal } from "./HotScopedCredentialsModal/HotScopedCredentialsModal";-import { OAuthFlowWaitingModal } from "./OAuthWaitingModal/OAuthWaitingModal";-import { PasswordCredentialsModal } from "./PasswordCredentialsModal/PasswordCredentialsModal";--const fallbackIcon = FaKey;--// --8<-- [start:ProviderIconsEmbed]-// Provider icons mapping - uses fallback for unknown providers-export const providerIcons: Partial<- Record<string, React.FC<{ className?: string }>>-> = {- aiml_api: fallbackIcon,- anthropic: fallbackIcon,- apollo: fallbackIcon,- e2b: fallbackIcon,- github: FaGithub,- google: FaGoogle,- groq: fallbackIcon,- http: fallbackIcon,- notion: NotionLogoIcon,- nvidia: fallbackIcon,- discord: FaDiscord,- d_id: fallbackIcon,- google_maps: FaGoogle,- jina: fallbackIcon,- ideogram: fallbackIcon,- linear: fallbackIcon,- medium: FaMedium,- mem0: fallbackIcon,- ollama: fallbackIcon,- openai: fallbackIcon,- openweathermap: fallbackIcon,- open_router: fallbackIcon,- llama_api: fallbackIcon,- pinecone: fallbackIcon,- enrichlayer: fallbackIcon,- slant3d: fallbackIcon,- screenshotone: fallbackIcon,- smtp: fallbackIcon,- replicate: fallbackIcon,- reddit: fallbackIcon,- fal: fallbackIcon,- revid: fallbackIcon,- twitter: FaTwitter,- unreal_speech: fallbackIcon,- exa: fallbackIcon,- hubspot: FaHubspot,- smartlead: fallbackIcon,- todoist: fallbackIcon,- zerobounce: fallbackIcon,-};-// --8<-- [end:ProviderIconsEmbed]--export type OAuthPopupResultMessage = { message_type: "oauth_popup_result" } & (- | {- success: true;- code: string;- state: string;- }- | {- success: false;- message: string;- }-);--export const CredentialsInput: FC<{+import { toDisplayName } from "@/providers/agent-credentials/helper";+import { APIKeyCredentialsModal } from "./components/APIKeyCredentialsModal/APIKeyCredentialsModal";+import { CredentialRow } from "./components/CredentialRow/CredentialRow";+import { CredentialsSelect } from "./components/CredentialsSelect/CredentialsSelect";+import { DeleteConfirmationModal } from "./components/DeleteConfirmationModal/DeleteConfirmationModal";+import { HostScopedCredentialsModal } from "./components/HotScopedCredentialsModal/HotScopedCredentialsModal";+import { OAuthFlowWaitingModal } from "./components/OAuthWaitingModal/OAuthWaitingModal";+import { PasswordCredentialsModal } from "./components/PasswordCredentialsModal/PasswordCredentialsModal";+import { getCredentialDisplayName } from "./helpers";+import { useCredentialsInputs } from "./useCredentialsInputs";++type UseCredentialsInputsReturn = ReturnType<typeof useCredentialsInputs>;++function isLoaded(+ data: UseCredentialsInputsReturn,+): data is Extract<UseCredentialsInputsReturn, { isLoading: false }> {+ return data.isLoading === false;+}++type Props = {schema: BlockIOCredentialsSubSchema;className?: string;selectedCredentials?: CredentialsMetaInput;- onSelectCredentials: (newValue?: CredentialsMetaInput) => void;siblingInputs?: Record<string, any>;- hideIfSingleCredentialAvailable?: boolean;+ onSelectCredentials: (newValue?: CredentialsMetaInput) => void;onLoaded?: (loaded: boolean) => void;-}> = ({+ readOnly?: boolean;+};++export function CredentialsInput({schema,className,selectedCredentials,onSelectCredentials,siblingInputs,- hideIfSingleCredentialAvailable = true,onLoaded,-}) => {- const [isAPICredentialsModalOpen, setAPICredentialsModalOpen] =- useState(false);- const [- isUserPasswordCredentialsModalOpen,- setUserPasswordCredentialsModalOpen,- ] = useState(false);- const [isHostScopedCredentialsModalOpen, setHostScopedCredentialsModalOpen] =- useState(false);- const [isOAuth2FlowInProgress, setOAuth2FlowInProgress] = useState(false);- const [oAuthPopupController, setOAuthPopupController] =- useState<AbortController | null>(null);- const [oAuthError, setOAuthError] = useState<string | null>(null);-- const api = useBackendAPI();- const credentials = useCredentials(schema, siblingInputs);-- // Report loaded state to parent- useEffect(() => {- if (onLoaded) {- onLoaded(Boolean(credentials && credentials.isLoading === false));- }- }, [credentials, onLoaded]);-- // Deselect credentials if they do not exist (e.g. provider was changed)- useEffect(() => {- if (!credentials || !("savedCredentials" in credentials)) return;- if (- selectedCredentials &&- !credentials.savedCredentials.some((c) => c.id === selectedCredentials.id)- ) {- onSelectCredentials(undefined);- }- }, [credentials, selectedCredentials, onSelectCredentials]);-- const { hasRelevantCredentials, singleCredential } = useMemo(() => {- if (!credentials || !("savedCredentials" in credentials)) {- return {- hasRelevantCredentials: false,- singleCredential: null,- };- }-- // Simple logic: if we have any saved credentials, we have relevant credentials- const hasRelevant = credentials.savedCredentials.length > 0;-- // Auto-select single credential if only one exists- const single =- credentials.savedCredentials.length === 1- ? credentials.savedCredentials[0]- : null;-- return {- hasRelevantCredentials: hasRelevant,- singleCredential: single,- };- }, [credentials]);-- // If only 1 credential is available, auto-select it and hide this input- useEffect(() => {- if (singleCredential && !selectedCredentials) {- onSelectCredentials(singleCredential);- }- }, [singleCredential, selectedCredentials, onSelectCredentials]);-- if (- !credentials ||- credentials.isLoading ||- (singleCredential && hideIfSingleCredentialAvailable)- ) {+ readOnly = false,+}: Props) {+ const hookData = useCredentialsInputs({+ schema,+ selectedCredentials,+ onSelectCredentials,+ siblingInputs,+ onLoaded,+ readOnly,+ });++ if (!isLoaded(hookData)) {return null;}@@ -194,309 +64,158 @@ export const CredentialsInput: FC<{supportsOAuth2,supportsUserPassword,supportsHostScoped,- savedCredentials,- oAuthCallback,- } = credentials;-- async function handleOAuthLogin() {- setOAuthError(null);- const { login_url, state_token } = await api.oAuthLogin(- provider,- schema.credentials_scopes,- );- setOAuth2FlowInProgress(true);- const popup = window.open(login_url, "_blank", "popup=true");-- if (!popup) {- throw new Error(- "Failed to open popup window. Please allow popups for this site.",- );- }-- const controller = new AbortController();- setOAuthPopupController(controller);- controller.signal.onabort = () => {- console.debug("OAuth flow aborted");- setOAuth2FlowInProgress(false);- popup.close();- };-- const handleMessage = async (e: MessageEvent<OAuthPopupResultMessage>) => {- console.debug("Message received:", e.data);- if (- typeof e.data != "object" ||- !("message_type" in e.data) ||- e.data.message_type !== "oauth_popup_result"- ) {- console.debug("Ignoring irrelevant message");- return;- }-- if (!e.data.success) {- console.error("OAuth flow failed:", e.data.message);- setOAuthError(`OAuth flow failed: ${e.data.message}`);- setOAuth2FlowInProgress(false);- return;- }-- if (e.data.state !== state_token) {- console.error("Invalid state token received");- setOAuthError("Invalid state token received");- setOAuth2FlowInProgress(false);- return;- }-- try {- console.debug("Processing OAuth callback");- const credentials = await oAuthCallback(e.data.code, e.data.state);- console.debug("OAuth callback processed successfully");- onSelectCredentials({- id: credentials.id,- type: "oauth2",- title: credentials.title,- provider,- });- } catch (error) {- console.error("Error in OAuth callback:", error);- setOAuthError(- // type of error is unkown so we need to use String(error)- `Error in OAuth callback: ${- error instanceof Error ? error.message : String(error)- }`,- );- } finally {- console.debug("Finalizing OAuth flow");- setOAuth2FlowInProgress(false);- controller.abort("success");- }- };-- console.debug("Adding message event listener");- window.addEventListener("message", handleMessage, {- signal: controller.signal,- });-- setTimeout(- () => {- console.debug("OAuth flow timed out");- controller.abort("timeout");- setOAuth2FlowInProgress(false);- setOAuthError("OAuth flow timed out");- },- 5 * 60 * 1000,- );- }-- const ProviderIcon = providerIcons[provider] || fallbackIcon;- const modals = (- <>- {supportsApiKey && (- <APIKeyCredentialsModal- schema={schema}- open={isAPICredentialsModalOpen}- onClose={() => setAPICredentialsModalOpen(false)}- onCredentialsCreate={(credsMeta) => {- onSelectCredentials(credsMeta);- setAPICredentialsModalOpen(false);- }}- siblingInputs={siblingInputs}- />- )}- {supportsOAuth2 && (- <OAuthFlowWaitingModal- open={isOAuth2FlowInProgress}- onClose={() => oAuthPopupController?.abort("canceled")}- providerName={providerName}- />- )}- {supportsUserPassword && (- <PasswordCredentialsModal- schema={schema}- open={isUserPasswordCredentialsModalOpen}- onClose={() => setUserPasswordCredentialsModalOpen(false)}- onCredentialsCreate={(creds) => {- onSelectCredentials(creds);- setUserPasswordCredentialsModalOpen(false);- }}- siblingInputs={siblingInputs}- />- )}- {supportsHostScoped && (- <HostScopedCredentialsModal- schema={schema}- open={isHostScopedCredentialsModalOpen}- onClose={() => setHostScopedCredentialsModalOpen(false)}- onCredentialsCreate={(creds) => {- onSelectCredentials(creds);- setHostScopedCredentialsModalOpen(false);- }}- siblingInputs={siblingInputs}- />- )}- </>- );+ credentialsToShow,+ oAuthError,+ isAPICredentialsModalOpen,+ isUserPasswordCredentialsModalOpen,+ isHostScopedCredentialsModalOpen,+ isOAuth2FlowInProgress,+ oAuthPopupController,+ credentialToDelete,+ deleteCredentialsMutation,+ actionButtonText,+ setAPICredentialsModalOpen,+ setUserPasswordCredentialsModalOpen,+ setHostScopedCredentialsModalOpen,+ setCredentialToDelete,+ handleActionButtonClick,+ handleCredentialSelect,+ handleDeleteCredential,+ handleDeleteConfirm,+ } = hookData;- const fieldHeader = (- <div className="mb-2 flex gap-1">- <span className="text-m green text-gray-900">- {providerName} Credentials- </span>- <InformationTooltip description={schema.description} />- </div>- );+ const displayName = toDisplayName(provider);+ const hasCredentialsToShow = credentialsToShow.length > 0;- // Show credentials creation UI when no relevant credentials exist- if (!hasRelevantCredentials) {- return (- <div className="mb-4">- {fieldHeader}+ return (+ <div className={cn("mb-6", className)}>+ <div className="mb-2 flex items-center gap-2">+ <Text variant="large-medium">{displayName} credentials</Text>+ {schema.description && (+ <InformationTooltip description={schema.description} />+ )}+ </div>- <div className={cn("flex flex-row space-x-2", className)}>- {supportsOAuth2 && (- <Button onClick={handleOAuthLogin} size="small">- <ProviderIcon className="mr-2 h-4 w-4" />- {"Sign in with " + providerName}- </Button>+ {hasCredentialsToShow ? (+ <>+ {credentialsToShow.length > 1 && !readOnly ? (+ <CredentialsSelect+ credentials={credentialsToShow}+ provider={provider}+ displayName={displayName}+ selectedCredentials={selectedCredentials}+ onSelectCredential={handleCredentialSelect}+ readOnly={readOnly}+ />+ ) : (+ <div className="mb-4 space-y-2">+ {credentialsToShow.map((credential) => {+ return (+ <CredentialRow+ key={credential.id}+ credential={credential}+ provider={provider}+ displayName={displayName}+ onSelect={() => handleCredentialSelect(credential.id)}+ onDelete={() =>+ handleDeleteCredential({+ id: credential.id,+ title: getCredentialDisplayName(+ credential,+ displayName,+ ),+ })+ }+ readOnly={readOnly}+ />+ );+ })}+ </div>)}- {supportsApiKey && (+ {!readOnly && (<Button- onClick={() => setAPICredentialsModalOpen(true)}+ variant="secondary"size="small"+ onClick={handleActionButtonClick}+ className="w-fit">- <ProviderIcon className="mr-2 h-4 w-4" />- Enter API key+ {actionButtonText}</Button>)}- {supportsUserPassword && (- <Button- onClick={() => setUserPasswordCredentialsModalOpen(true)}- size="small"- >- <ProviderIcon className="mr-2 h-4 w-4" />- Enter username and password- </Button>- )}- {supportsHostScoped && credentials.discriminatorValue && (- <Button- onClick={() => setHostScopedCredentialsModalOpen(true)}- size="small"- >- <ProviderIcon className="mr-2 h-4 w-4" />- {`Enter sensitive headers for ${getHostFromUrl(credentials.discriminatorValue)}`}- </Button>- )}- </div>- {modals}- {oAuthError && (- <div className="mt-2 text-red-500">Error: {oAuthError}</div>- )}- </div>- );- }-- function handleValueChange(newValue: string) {- if (newValue === "sign-in") {- // Trigger OAuth2 sign in flow- handleOAuthLogin();- } else if (newValue === "add-api-key") {- // Open API key dialog- setAPICredentialsModalOpen(true);- } else if (newValue === "add-user-password") {- // Open user password dialog- setUserPasswordCredentialsModalOpen(true);- } else if (newValue === "add-host-scoped") {- // Open host-scoped credentials dialog- setHostScopedCredentialsModalOpen(true);- } else {- const selectedCreds = savedCredentials.find((c) => c.id == newValue)!;-- onSelectCredentials({- id: selectedCreds.id,- type: selectedCreds.type,- provider: provider,- // title: customTitle, // TODO: add input for title- });- }- }-- // Saved credentials exist- return (- <div>- {fieldHeader}+ </>+ ) : (+ !readOnly && (+ <Button+ variant="secondary"+ size="small"+ onClick={handleActionButtonClick}+ className="w-fit"+ >+ {actionButtonText}+ </Button>+ )+ )}- <Select value={selectedCredentials?.id} onValueChange={handleValueChange}>- <SelectTrigger>- <SelectValue placeholder={schema.placeholder} />- </SelectTrigger>- <SelectContent className="nodrag">- {savedCredentials- .filter((c) => c.type == "oauth2")- .map((credentials, index) => (- <SelectItem key={index} value={credentials.id}>- <ProviderIcon className="mr-2 inline h-4 w-4" />- {credentials.title ||- credentials.username ||- `Your ${providerName} account`}- </SelectItem>- ))}- {savedCredentials- .filter((c) => c.type == "api_key")- .map((credentials, index) => (- <SelectItem key={index} value={credentials.id}>- <ProviderIcon className="mr-2 inline h-4 w-4" />- <IconKey className="mr-1.5 inline" />- {credentials.title}- </SelectItem>- ))}- {savedCredentials- .filter((c) => c.type == "user_password")- .map((credentials, index) => (- <SelectItem key={index} value={credentials.id}>- <ProviderIcon className="mr-2 inline h-4 w-4" />- <IconUserPlus className="mr-1.5 inline" />- {credentials.title}- </SelectItem>- ))}- {savedCredentials- .filter((c) => c.type == "host_scoped")- .map((credentials, index) => (- <SelectItem key={index} value={credentials.id}>- <ProviderIcon className="mr-2 inline h-4 w-4" />- <IconKey className="mr-1.5 inline" />- {credentials.title}- </SelectItem>- ))}- <SelectSeparator />- {supportsOAuth2 && (- <SelectItem value="sign-in">- <IconUserPlus className="mr-1.5 inline" />- Sign in with {providerName}- </SelectItem>- )}- {supportsApiKey && (- <SelectItem value="add-api-key">- <IconKeyPlus className="mr-1.5 inline" />- Add new API key- </SelectItem>- )}- {supportsUserPassword && (- <SelectItem value="add-user-password">- <IconUserPlus className="mr-1.5 inline" />- Add new user password- </SelectItem>- )}- {supportsHostScoped && (- <SelectItem value="add-host-scoped">- <IconKey className="mr-1.5 inline" />- Add host-scoped headers- </SelectItem>- )}- </SelectContent>- </Select>- {modals}- {oAuthError && (- <div className="mt-2 text-red-500">Error: {oAuthError}</div>+ {!readOnly && (+ <>+ {supportsApiKey ? (+ <APIKeyCredentialsModal+ schema={schema}+ open={isAPICredentialsModalOpen}+ onClose={() => setAPICredentialsModalOpen(false)}+ onCredentialsCreate={(credsMeta) => {+ onSelectCredentials(credsMeta);+ setAPICredentialsModalOpen(false);+ }}+ siblingInputs={siblingInputs}+ />+ ) : null}+ {supportsOAuth2 ? (+ <OAuthFlowWaitingModal+ open={isOAuth2FlowInProgress}+ onClose={() => oAuthPopupController?.abort("canceled")}+ providerName={providerName}+ />+ ) : null}+ {supportsUserPassword ? (+ <PasswordCredentialsModal+ schema={schema}+ open={isUserPasswordCredentialsModalOpen}+ onClose={() => setUserPasswordCredentialsModalOpen(false)}+ onCredentialsCreate={(creds) => {+ onSelectCredentials(creds);+ setUserPasswordCredentialsModalOpen(false);+ }}+ siblingInputs={siblingInputs}+ />+ ) : null}+ {supportsHostScoped ? (+ <HostScopedCredentialsModal+ schema={schema}+ open={isHostScopedCredentialsModalOpen}+ onClose={() => setHostScopedCredentialsModalOpen(false)}+ onCredentialsCreate={(creds) => {+ onSelectCredentials(creds);+ setHostScopedCredentialsModalOpen(false);+ }}+ siblingInputs={siblingInputs}+ />+ ) : null}++ {oAuthError ? (+ <Text variant="body" className="mt-2 text-red-500">+ Error: {oAuthError}+ </Text>+ ) : null}++ <DeleteConfirmationModal+ credentialToDelete={credentialToDelete}+ isDeleting={deleteCredentialsMutation.isPending}+ onClose={() => setCredentialToDelete(null)}+ onConfirm={handleDeleteConfirm}+ />+ </>)}</div>);-};+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/APIKeyCredentialsModal/APIKeyCredentialsModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/APIKeyCredentialsModal/APIKeyCredentialsModal.tsxrename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/APIKeyCredentialsModal.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/APIKeyCredentialsModal/useAPIKeyCredentialsModal.ts b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.tssimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/APIKeyCredentialsModal/useAPIKeyCredentialsModal.tsrename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/APIKeyCredentialsModal/useAPIKeyCredentialsModal.tsdiff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialRow/CredentialRow.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialRow/CredentialRow.tsxnew file mode 100644index 0000000000..251b4cfbb4--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialRow/CredentialRow.tsx@@ -0,0 +1,102 @@+import { IconKey } from "@/components/__legacy__/ui/icons";+import { Text } from "@/components/atoms/Text/Text";+import {+ DropdownMenu,+ DropdownMenuContent,+ DropdownMenuItem,+ DropdownMenuTrigger,+} from "@/components/molecules/DropdownMenu/DropdownMenu";+import { cn } from "@/lib/utils";+import { CaretDown, DotsThreeVertical } from "@phosphor-icons/react";+import {+ fallbackIcon,+ getCredentialDisplayName,+ MASKED_KEY_LENGTH,+ providerIcons,+} from "../../helpers";++type CredentialRowProps = {+ credential: {+ id: string;+ title?: string;+ username?: string;+ type: string;+ provider: string;+ };+ provider: string;+ displayName: string;+ onSelect: () => void;+ onDelete: () => void;+ readOnly?: boolean;+ showCaret?: boolean;+ asSelectTrigger?: boolean;+};++export function CredentialRow({+ credential,+ provider,+ displayName,+ onSelect,+ onDelete,+ readOnly = false,+ showCaret = false,+ asSelectTrigger = false,+}: CredentialRowProps) {+ const ProviderIcon = providerIcons[provider] || fallbackIcon;++ return (+ <div+ className={cn(+ "flex items-center gap-3 rounded-medium border border-zinc-200 bg-white p-3 transition-colors",+ asSelectTrigger ? "border-0 bg-transparent" : readOnly ? "w-fit" : "",+ )}+ onClick={readOnly || showCaret || asSelectTrigger ? undefined : onSelect}+ style={+ readOnly || showCaret || asSelectTrigger+ ? { cursor: showCaret || asSelectTrigger ? "pointer" : "default" }+ : undefined+ }+ >+ <div className="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-gray-900">+ <ProviderIcon className="h-3 w-3 text-white" />+ </div>+ <IconKey className="h-5 w-5 shrink-0 text-zinc-800" />+ <div className="flex min-w-0 flex-1 flex-nowrap items-center gap-4">+ <Text variant="body" className="tracking-tight">+ {getCredentialDisplayName(credential, displayName)}+ </Text>+ <Text+ variant="large"+ className="relative top-1 font-mono tracking-tight"+ >+ {"*".repeat(MASKED_KEY_LENGTH)}+ </Text>+ </div>+ {showCaret && !asSelectTrigger && (+ <CaretDown className="h-4 w-4 shrink-0 text-gray-400" />+ )}+ {!readOnly && !showCaret && !asSelectTrigger && (+ <DropdownMenu>+ <DropdownMenuTrigger asChild>+ <button+ className="ml-auto shrink-0 rounded p-1 hover:bg-gray-100"+ onClick={(e) => e.stopPropagation()}+ >+ <DotsThreeVertical className="h-5 w-5 text-gray-400" />+ </button>+ </DropdownMenuTrigger>+ <DropdownMenuContent align="end">+ <DropdownMenuItem+ onClick={(e) => {+ e.stopPropagation();+ onDelete();+ }}+ >+ Delete+ </DropdownMenuItem>+ </DropdownMenuContent>+ </DropdownMenu>+ )}+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialsSelect/CredentialsSelect.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialsSelect/CredentialsSelect.tsxnew file mode 100644index 0000000000..29f9b09a22--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/CredentialsSelect/CredentialsSelect.tsx@@ -0,0 +1,86 @@+import {+ Select,+ SelectContent,+ SelectItem,+ SelectTrigger,+ SelectValue,+} from "@/components/__legacy__/ui/select";+import { Text } from "@/components/atoms/Text/Text";+import { CredentialsMetaInput } from "@/lib/autogpt-server-api/types";+import { useEffect } from "react";+import { getCredentialDisplayName } from "../../helpers";+import { CredentialRow } from "../CredentialRow/CredentialRow";++interface Props {+ credentials: Array<{+ id: string;+ title?: string;+ username?: string;+ type: string;+ provider: string;+ }>;+ provider: string;+ displayName: string;+ selectedCredentials?: CredentialsMetaInput;+ onSelectCredential: (credentialId: string) => void;+ readOnly?: boolean;+}++export function CredentialsSelect({+ credentials,+ provider,+ displayName,+ selectedCredentials,+ onSelectCredential,+ readOnly = false,+}: Props) {+ // Auto-select first credential if none is selected+ useEffect(() => {+ if (!selectedCredentials && credentials.length > 0) {+ onSelectCredential(credentials[0].id);+ }+ }, [selectedCredentials, credentials, onSelectCredential]);++ return (+ <div className="mb-4 w-full">+ <Select+ value={selectedCredentials?.id || ""}+ onValueChange={(value) => onSelectCredential(value)}+ >+ <SelectTrigger className="h-auto min-h-12 w-full rounded-medium border-zinc-200 p-0 pr-4 shadow-none">+ <SelectValue asChild>+ {selectedCredentials ? (+ <CredentialRow+ credential={{+ id: selectedCredentials.id,+ title: selectedCredentials.title || undefined,+ type: selectedCredentials.type,+ provider: selectedCredentials.provider,+ }}+ provider={provider}+ displayName={displayName}+ onSelect={() => {}}+ onDelete={() => {}}+ readOnly={readOnly}+ asSelectTrigger={true}+ />+ ) : (+ <Text variant="large">Select credential</Text>+ )}+ </SelectValue>+ </SelectTrigger>+ <SelectContent>+ {credentials.map((credential) => (+ <SelectItem key={credential.id} value={credential.id}>+ <div className="flex items-center gap-2">+ <Text variant="body" className="tracking-tight">+ {getCredentialDisplayName(credential, displayName)}+ </Text>+ </div>+ </SelectItem>+ ))}+ </SelectContent>+ </Select>+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/DeleteConfirmationModal/DeleteConfirmationModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/DeleteConfirmationModal/DeleteConfirmationModal.tsxnew file mode 100644index 0000000000..e3dd811ccc--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/DeleteConfirmationModal/DeleteConfirmationModal.tsx@@ -0,0 +1,49 @@+import { Button } from "@/components/atoms/Button/Button";+import { Text } from "@/components/atoms/Text/Text";+import { Dialog } from "@/components/molecules/Dialog/Dialog";++interface Props {+ credentialToDelete: { id: string; title: string } | null;+ isDeleting: boolean;+ onClose: () => void;+ onConfirm: () => void;+}++export function DeleteConfirmationModal({+ credentialToDelete,+ isDeleting,+ onClose,+ onConfirm,+}: Props) {+ return (+ <Dialog+ controlled={{+ isOpen: credentialToDelete !== null,+ set: (open) => {+ if (!open) onClose();+ },+ }}+ title="Delete credential"+ styling={{ maxWidth: "32rem" }}+ >+ <Dialog.Content>+ <Text variant="large">+ Are you sure you want to delete "{credentialToDelete?.title}+ "? This action cannot be undone.+ </Text>+ <Dialog.Footer>+ <Button variant="secondary" onClick={onClose} disabled={isDeleting}>+ Cancel+ </Button>+ <Button+ variant="destructive"+ onClick={onConfirm}+ loading={isDeleting}+ >+ Delete+ </Button>+ </Dialog.Footer>+ </Dialog.Content>+ </Dialog>+ );+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/HotScopedCredentialsModal/HotScopedCredentialsModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/HotScopedCredentialsModal/HotScopedCredentialsModal.tsxrename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/HotScopedCredentialsModal/HotScopedCredentialsModal.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/OAuthWaitingModal/OAuthWaitingModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/OAuthWaitingModal/OAuthWaitingModal.tsxsimilarity index 100%rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/OAuthWaitingModal/OAuthWaitingModal.tsxrename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/OAuthWaitingModal/OAuthWaitingModal.tsxdiff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/PasswordCredentialsModal/PasswordCredentialsModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/PasswordCredentialsModal/PasswordCredentialsModal.tsxsimilarity index 94%rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/PasswordCredentialsModal/PasswordCredentialsModal.tsxrename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/PasswordCredentialsModal/PasswordCredentialsModal.tsxindex 5fbea007cc..c75b7be988 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/PasswordCredentialsModal/PasswordCredentialsModal.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/components/PasswordCredentialsModal/PasswordCredentialsModal.tsx@@ -1,15 +1,15 @@-import { z } from "zod";-import { useForm } from "react-hook-form";-import { zodResolver } from "@hookform/resolvers/zod";-import { Input } from "@/components/atoms/Input/Input";+import { Form, FormField } from "@/components/__legacy__/ui/form";import { Button } from "@/components/atoms/Button/Button";+import { Input } from "@/components/atoms/Input/Input";import { Dialog } from "@/components/molecules/Dialog/Dialog";-import { Form, FormField } from "@/components/__legacy__/ui/form";import useCredentials from "@/hooks/useCredentials";import {BlockIOCredentialsSubSchema,CredentialsMetaInput,} from "@/lib/autogpt-server-api/types";+import { zodResolver } from "@hookform/resolvers/zod";+import { useForm } from "react-hook-form";+import { z } from "zod";type Props = {schema: BlockIOCredentialsSubSchema;@@ -85,7 +85,7 @@ export function PasswordCredentialsModal({<Form {...form}><formonSubmit={form.handleSubmit(onSubmit)}- className="space-y-2 pt-4"+ className="w-[98%] space-y-2 pt-4"><FormFieldcontrol={form.control}@@ -96,7 +96,6 @@ export function PasswordCredentialsModal({label="Username"type="text"placeholder="Enter username..."- size="small"{...field}/>)}@@ -110,7 +109,6 @@ export function PasswordCredentialsModal({label="Password"type="password"placeholder="Enter password..."- size="small"{...field}/>)}@@ -124,12 +122,12 @@ export function PasswordCredentialsModal({label="Name"type="text"placeholder="Enter a name for this user login..."- size="small"+ className="mb-8"{...field}/>)}/>- <Button type="submit" size="small" className="min-w-68">+ <Button type="submit" className="w-full">Save & use this user login</Button></form>diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/helpers.ts b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/helpers.tsnew file mode 100644index 0000000000..9e6f374437--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/helpers.ts@@ -0,0 +1,102 @@+import { KeyIcon } from "@phosphor-icons/react";+import { NotionLogoIcon } from "@radix-ui/react-icons";+import {+ FaDiscord,+ FaGithub,+ FaGoogle,+ FaHubspot,+ FaMedium,+ FaTwitter,+} from "react-icons/fa";++export const fallbackIcon = KeyIcon;++export const providerIcons: Partial<+ Record<string, React.FC<{ className?: string }>>+> = {+ aiml_api: fallbackIcon,+ anthropic: fallbackIcon,+ apollo: fallbackIcon,+ e2b: fallbackIcon,+ github: FaGithub,+ google: FaGoogle,+ groq: fallbackIcon,+ http: fallbackIcon,+ notion: NotionLogoIcon,+ nvidia: fallbackIcon,+ discord: FaDiscord,+ d_id: fallbackIcon,+ google_maps: FaGoogle,+ jina: fallbackIcon,+ ideogram: fallbackIcon,+ linear: fallbackIcon,+ medium: FaMedium,+ mem0: fallbackIcon,+ ollama: fallbackIcon,+ openai: fallbackIcon,+ openweathermap: fallbackIcon,+ open_router: fallbackIcon,+ llama_api: fallbackIcon,+ pinecone: fallbackIcon,+ enrichlayer: fallbackIcon,+ slant3d: fallbackIcon,+ screenshotone: fallbackIcon,+ smtp: fallbackIcon,+ replicate: fallbackIcon,+ reddit: fallbackIcon,+ fal: fallbackIcon,+ revid: fallbackIcon,+ twitter: FaTwitter,+ unreal_speech: fallbackIcon,+ exa: fallbackIcon,+ hubspot: FaHubspot,+ smartlead: fallbackIcon,+ todoist: fallbackIcon,+ zerobounce: fallbackIcon,+};++export type OAuthPopupResultMessage = { message_type: "oauth_popup_result" } & (+ | {+ success: true;+ code: string;+ state: string;+ }+ | {+ success: false;+ message: string;+ }+);++export function getActionButtonText(+ supportsOAuth2: boolean,+ supportsApiKey: boolean,+ supportsUserPassword: boolean,+ supportsHostScoped: boolean,+ hasExistingCredentials: boolean,+): string {+ if (hasExistingCredentials) {+ if (supportsOAuth2) return "Connect a different account";+ if (supportsApiKey) return "Use a different API key";+ if (supportsUserPassword) return "Use a different username and password";+ if (supportsHostScoped) return "Use different headers";+ return "Add credentials";+ } else {+ if (supportsOAuth2) return "Add account";+ if (supportsApiKey) return "Add API key";+ if (supportsUserPassword) return "Add username and password";+ if (supportsHostScoped) return "Add headers";+ return "Add credentials";+ }+}++export function getCredentialDisplayName(+ credential: { title?: string; username?: string },+ displayName: string,+): string {+ return (+ credential.title || credential.username || `Your ${displayName} account`+ );+}++export const OAUTH_TIMEOUT_MS = 5 * 60 * 1000;+export const MASKED_KEY_LENGTH = 30;diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/useCredentialsInputs.ts b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/useCredentialsInputs.tsnew file mode 100644index 0000000000..460980c10b--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/useCredentialsInputs.ts@@ -0,0 +1,318 @@+import { useDeleteV1DeleteCredentials } from "@/app/api/__generated__/endpoints/integrations/integrations";+import useCredentials from "@/hooks/useCredentials";+import { useBackendAPI } from "@/lib/autogpt-server-api/context";+import {+ BlockIOCredentialsSubSchema,+ CredentialsMetaInput,+} from "@/lib/autogpt-server-api/types";+import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";+import { useQueryClient } from "@tanstack/react-query";+import { useContext, useEffect, useMemo, useState } from "react";+import {+ getActionButtonText,+ OAUTH_TIMEOUT_MS,+ OAuthPopupResultMessage,+} from "./helpers";++type Args = {+ schema: BlockIOCredentialsSubSchema;+ selectedCredentials?: CredentialsMetaInput;+ onSelectCredentials: (newValue?: CredentialsMetaInput) => void;+ siblingInputs?: Record<string, any>;+ onLoaded?: (loaded: boolean) => void;+ readOnly?: boolean;+};++export function useCredentialsInputs({+ schema,+ selectedCredentials,+ onSelectCredentials,+ siblingInputs,+ onLoaded,+ readOnly = false,+}: Args) {+ const [isAPICredentialsModalOpen, setAPICredentialsModalOpen] =+ useState(false);+ const [+ isUserPasswordCredentialsModalOpen,+ setUserPasswordCredentialsModalOpen,+ ] = useState(false);+ const [isHostScopedCredentialsModalOpen, setHostScopedCredentialsModalOpen] =+ useState(false);+ const [isOAuth2FlowInProgress, setOAuth2FlowInProgress] = useState(false);+ const [oAuthPopupController, setOAuthPopupController] =+ useState<AbortController | null>(null);+ const [oAuthError, setOAuthError] = useState<string | null>(null);+ const [credentialToDelete, setCredentialToDelete] = useState<{+ id: string;+ title: string;+ } | null>(null);++ const api = useBackendAPI();+ const queryClient = useQueryClient();+ const credentials = useCredentials(schema, siblingInputs);+ const allProviders = useContext(CredentialsProvidersContext);++ const deleteCredentialsMutation = useDeleteV1DeleteCredentials({+ mutation: {+ onSuccess: () => {+ queryClient.invalidateQueries({+ queryKey: ["/api/integrations/credentials"],+ });+ queryClient.invalidateQueries({+ queryKey: [`/api/integrations/${credentials?.provider}/credentials`],+ });+ setCredentialToDelete(null);+ if (selectedCredentials?.id === credentialToDelete?.id) {+ onSelectCredentials(undefined);+ }+ },+ },+ });++ const rawProvider = credentials+ ? allProviders?.[credentials.provider as keyof typeof allProviders]+ : null;++ useEffect(() => {+ if (onLoaded) {+ onLoaded(Boolean(credentials && credentials.isLoading === false));+ }+ }, [credentials, onLoaded]);++ useEffect(() => {+ if (readOnly) return;+ if (!credentials || !("savedCredentials" in credentials)) return;+ if (+ selectedCredentials &&+ !credentials.savedCredentials.some((c) => c.id === selectedCredentials.id)+ ) {+ onSelectCredentials(undefined);+ }+ }, [credentials, selectedCredentials, onSelectCredentials, readOnly]);++ const { singleCredential } = useMemo(() => {+ if (!credentials || !("savedCredentials" in credentials)) {+ return {+ singleCredential: null,+ };+ }++ const single =+ credentials.savedCredentials.length === 1+ ? credentials.savedCredentials[0]+ : null;++ return {+ singleCredential: single,+ };+ }, [credentials]);++ useEffect(() => {+ if (readOnly) return;+ if (singleCredential && !selectedCredentials) {+ onSelectCredentials(singleCredential);+ }+ }, [singleCredential, selectedCredentials, onSelectCredentials, readOnly]);++ if (+ !credentials ||+ credentials.isLoading ||+ !("savedCredentials" in credentials)+ ) {+ return {+ isLoading: true,+ };+ }++ const {+ provider,+ providerName,+ supportsApiKey,+ supportsOAuth2,+ supportsUserPassword,+ supportsHostScoped,+ savedCredentials,+ oAuthCallback,+ } = credentials;++ const allSavedCredentials = rawProvider?.savedCredentials || savedCredentials;++ const credentialsToShow = (() => {+ const creds = [...allSavedCredentials];+ if (+ !readOnly &&+ selectedCredentials &&+ !creds.some((c) => c.id === selectedCredentials.id)+ ) {+ creds.push({+ id: selectedCredentials.id,+ type: selectedCredentials.type,+ title: selectedCredentials.title || "Selected credential",+ provider: provider,+ } as any);+ }+ return creds;+ })();++ async function handleOAuthLogin() {+ setOAuthError(null);+ const { login_url, state_token } = await api.oAuthLogin(+ provider,+ schema.credentials_scopes,+ );+ setOAuth2FlowInProgress(true);+ const popup = window.open(login_url, "_blank", "popup=true");++ if (!popup) {+ throw new Error(+ "Failed to open popup window. Please allow popups for this site.",+ );+ }++ const controller = new AbortController();+ setOAuthPopupController(controller);+ controller.signal.onabort = () => {+ console.debug("OAuth flow aborted");+ setOAuth2FlowInProgress(false);+ popup.close();+ };++ const handleMessage = async (e: MessageEvent<OAuthPopupResultMessage>) => {+ console.debug("Message received:", e.data);+ if (+ typeof e.data != "object" ||+ !("message_type" in e.data) ||+ e.data.message_type !== "oauth_popup_result"+ ) {+ console.debug("Ignoring irrelevant message");+ return;+ }++ if (!e.data.success) {+ console.error("OAuth flow failed:", e.data.message);+ setOAuthError(`OAuth flow failed: ${e.data.message}`);+ setOAuth2FlowInProgress(false);+ return;+ }++ if (e.data.state !== state_token) {+ console.error("Invalid state token received");+ setOAuthError("Invalid state token received");+ setOAuth2FlowInProgress(false);+ return;+ }++ try {+ console.debug("Processing OAuth callback");+ const credentials = await oAuthCallback(e.data.code, e.data.state);+ console.debug("OAuth callback processed successfully");+ onSelectCredentials({+ id: credentials.id,+ type: "oauth2",+ title: credentials.title,+ provider,+ });+ } catch (error) {+ console.error("Error in OAuth callback:", error);+ setOAuthError(+ `Error in OAuth callback: ${+ error instanceof Error ? error.message : String(error)+ }`,+ );+ } finally {+ console.debug("Finalizing OAuth flow");+ setOAuth2FlowInProgress(false);+ controller.abort("success");+ }+ };++ console.debug("Adding message event listener");+ window.addEventListener("message", handleMessage, {+ signal: controller.signal,+ });++ setTimeout(() => {+ console.debug("OAuth flow timed out");+ controller.abort("timeout");+ setOAuth2FlowInProgress(false);+ setOAuthError("OAuth flow timed out");+ }, OAUTH_TIMEOUT_MS);+ }++ function handleActionButtonClick() {+ if (supportsOAuth2) {+ handleOAuthLogin();+ } else if (supportsApiKey) {+ setAPICredentialsModalOpen(true);+ } else if (supportsUserPassword) {+ setUserPasswordCredentialsModalOpen(true);+ } else if (supportsHostScoped) {+ setHostScopedCredentialsModalOpen(true);+ }+ }++ function handleCredentialSelect(credentialId: string) {+ const selectedCreds = credentialsToShow.find((c) => c.id === credentialId);+ if (selectedCreds) {+ onSelectCredentials({+ id: selectedCreds.id,+ type: selectedCreds.type,+ provider: provider,+ title: (selectedCreds as any).title,+ });+ }+ }++ function handleDeleteCredential(credential: { id: string; title: string }) {+ setCredentialToDelete(credential);+ }++ function handleDeleteConfirm() {+ if (credentialToDelete && credentials) {+ deleteCredentialsMutation.mutate({+ provider: credentials.provider,+ credId: credentialToDelete.id,+ });+ }+ }++ return {+ isLoading: false as const,+ provider,+ providerName,+ supportsApiKey,+ supportsOAuth2,+ supportsUserPassword,+ supportsHostScoped,+ credentialsToShow,+ selectedCredentials,+ oAuthError,+ isAPICredentialsModalOpen,+ isUserPasswordCredentialsModalOpen,+ isHostScopedCredentialsModalOpen,+ isOAuth2FlowInProgress,+ oAuthPopupController,+ credentialToDelete,+ deleteCredentialsMutation,+ actionButtonText: getActionButtonText(+ supportsOAuth2,+ supportsApiKey,+ supportsUserPassword,+ supportsHostScoped,+ credentialsToShow.length > 0,+ ),+ setAPICredentialsModalOpen,+ setUserPasswordCredentialsModalOpen,+ setHostScopedCredentialsModalOpen,+ setCredentialToDelete,+ handleActionButtonClick,+ handleCredentialSelect,+ handleDeleteCredential,+ handleDeleteConfirm,+ handleOAuthLogin,+ onSelectCredentials,+ schema,+ siblingInputs,+ };+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsxindex 810dfc9e64..eff83cf824 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/RunAgentModal.tsx@@ -5,12 +5,8 @@ import { GraphExecutionMeta } from "@/app/api/__generated__/models/graphExecutioimport { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";import { Button } from "@/components/atoms/Button/Button";import { Dialog } from "@/components/molecules/Dialog/Dialog";-import { AlarmIcon } from "@phosphor-icons/react";import { useState } from "react";import { ScheduleAgentModal } from "../ScheduleAgentModal/ScheduleAgentModal";-import { AgentCostSection } from "./components/AgentCostSection/AgentCostSection";-import { AgentDetails } from "./components/AgentDetails/AgentDetails";-import { AgentSectionHeader } from "./components/AgentSectionHeader/AgentSectionHeader";import { ModalHeader } from "./components/ModalHeader/ModalHeader";import { ModalRunSection } from "./components/ModalRunSection/ModalRunSection";import { RunActions } from "./components/RunActions/RunActions";@@ -122,59 +118,34 @@ export function RunAgentModal({><Dialog.Trigger>{triggerSlot}</Dialog.Trigger><Dialog.Content>- <div className="flex h-full flex-col pb-4">- {/* Header */}- <div className="flex-shrink-0">- <ModalHeader agent={agent} />- <AgentCostSection flowId={agent.graph_id} />+ {/* Header */}+ <ModalHeader agent={agent} />++ {/* Content */}+ {hasAnySetupFields ? (+ <div className="mt-10">+ <RunAgentModalContextProvider+ value={{+ agent,+ defaultRunType,+ presetName,+ setPresetName,+ presetDescription,+ setPresetDescription,+ inputValues,+ setInputValue: handleInputChange,+ agentInputFields,+ inputCredentials,+ setInputCredentialsValue: handleCredentialsChange,+ agentCredentialsInputFields,+ }}+ >+ <ModalRunSection />+ </RunAgentModalContextProvider></div>+ ) : null}- {/* Scrollable content */}- <div className="flex-1 pr-1" style={{ scrollbarGutter: "stable" }}>- {/* Setup Section */}- <div className="mt-10">- {hasAnySetupFields ? (- <RunAgentModalContextProvider- value={{- agent,- defaultRunType,- presetName,- setPresetName,- presetDescription,- setPresetDescription,- inputValues,- setInputValue: handleInputChange,- agentInputFields,- inputCredentials,- setInputCredentialsValue: handleCredentialsChange,- agentCredentialsInputFields,- }}- >- <>- <AgentSectionHeader- title={- defaultRunType === "automatic-trigger"- ? "Trigger Setup"- : "Agent Setup"- }- />- <ModalRunSection />- </>- </RunAgentModalContextProvider>- ) : null}- </div>-- {/* Agent Details Section */}- <div className="mt-8">- <AgentSectionHeader title="Agent Details" />- <AgentDetails agent={agent} />- </div>- </div>- </div>- <Dialog.Footer- className="fixed bottom-1 left-0 z-10 w-full bg-white p-4"- style={{ boxShadow: "0px -8px 10px white" }}- >+ <Dialog.Footer className="mt-6 bg-white pt-4"><div className="flex items-center justify-end gap-3"><Buttonvariant="secondary"@@ -183,8 +154,7 @@ export function RunAgentModal({isExecuting || isSettingUpTrigger || !allRequiredInputsAreSet}>- <AlarmIcon size={16} />- Schedule Agent+ Schedule Task</Button><RunActionsdefaultRunType={defaultRunType}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentCostSection/AgentCostSection.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentCostSection/AgentCostSection.tsxdeleted file mode 100644index 1b321a1342..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentCostSection/AgentCostSection.tsx+++ /dev/null@@ -1,31 +0,0 @@-import { Button } from "@/components/atoms/Button/Button";--interface Props {- flowId: string;-}--export function AgentCostSection({ flowId }: Props) {- return (- <div className="mt-6 flex items-center justify-between">- {/* TODO: enable once we have an API to show estimated cost for an agent run */}- {/* <div className="flex items-center gap-2">- <Text variant="body-medium">Cost</Text>- <Text variant="body">{cost}</Text>- </div> */}- <div className="flex items-center gap-2">- <Button- variant="outline"- size="small"- as="NextLink"- href={`/build?flowID=${flowId}`}- >- Open in builder- </Button>- {/* TODO: enable once we can easily link to the agent listing page from the library agent response */}- {/* <Button variant="outline" size="small">- View listing <ArrowSquareOutIcon size={16} />- </Button> */}- </div>- </div>- );-}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentDetails/AgentDetails.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentDetails/AgentDetails.tsxdeleted file mode 100644index d88ad44cf3..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentDetails/AgentDetails.tsx+++ /dev/null@@ -1,48 +0,0 @@-import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";-import { Text } from "@/components/atoms/Text/Text";-import { Badge } from "@/components/atoms/Badge/Badge";-import { formatDate } from "@/lib/utils/time";--interface Props {- agent: LibraryAgent;-}--export function AgentDetails({ agent }: Props) {- return (- <div className="mt-4 flex flex-col gap-5">- <div>- <Text variant="body-medium" className="mb-1 !text-black">- Version- </Text>- <div className="flex items-center gap-2">- <Text variant="body" className="!text-zinc-700">- v{agent.graph_version}- </Text>- {agent.is_latest_version && (- <Badge variant="success" size="small">- Latest- </Badge>- )}- </div>- </div>- <div>- <Text variant="body-medium" className="mb-1 !text-black">- Last Updated- </Text>- <Text variant="body" className="!text-zinc-700">- {formatDate(agent.updated_at)}- </Text>- </div>- {agent.has_external_trigger && (- <div>- <Text variant="body-medium" className="mb-1">- Trigger Type- </Text>- <Text variant="body" className="!text-neutral-700">- External Webhook- </Text>- </div>- )}- </div>- );-}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentSectionHeader/AgentSectionHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentSectionHeader/AgentSectionHeader.tsxdeleted file mode 100644index 6cd2f29d06..0000000000--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/AgentSectionHeader/AgentSectionHeader.tsx+++ /dev/null@@ -1,15 +0,0 @@-import { Text } from "@/components/atoms/Text/Text";--interface Props {- title: string;-}--export function AgentSectionHeader({ title }: Props) {- return (- <div className="border-t border-zinc-400 px-0 pb-2 pt-1">- <Text variant="label" className="!text-zinc-700">- {title}- </Text>- </div>- );-}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsxindex 527475fe2f..2a31f62f82 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalHeader/ModalHeader.tsx@@ -1,8 +1,8 @@-import { Badge } from "@/components/atoms/Badge/Badge";import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";+import { Badge } from "@/components/atoms/Badge/Badge";+import { Link } from "@/components/atoms/Link/Link";import { Text } from "@/components/atoms/Text/Text";import { ShowMoreText } from "@/components/molecules/ShowMoreText/ShowMoreText";-import { ClockIcon, InfoIcon } from "@phosphor-icons/react";import { humanizeCronExpression } from "@/lib/cron-expression-utils";interface ModalHeaderProps {@@ -10,49 +10,56 @@ interface ModalHeaderProps {}export function ModalHeader({ agent }: ModalHeaderProps) {- const isUnknownCreator = agent.creator_name === "Unknown";+ const creator = agent.marketplace_listing?.creator;return (- <div className="space-y-4">- <div className="flex items-center gap-3">- <Badge variant="info">New Run</Badge>- </div>+ <div className="flex flex-col gap-4">+ <Badge variant="info" className="w-fit">+ New Task+ </Badge><div>- <Text variant="h3">{agent.name}</Text>- {!isUnknownCreator ? (- <Text variant="body-medium">by {agent.creator_name}</Text>+ <Text variant="h2">{agent.name}</Text>+ {creator ? (+ <Link href={`/marketplace/creator/${creator.slug}`} isExternal>+ by {creator.name}+ </Link>) : null}- <ShowMoreText- previewLimit={80}- variant="small"- className="mt-4 !text-zinc-700"- >- {agent.description}- </ShowMoreText>-- {/* Schedule recommendation tip */}- {agent.recommended_schedule_cron && !agent.has_external_trigger && (- <div className="mt-4 flex items-center gap-2">- <ClockIcon className="h-4 w-4 text-gray-500" />- <p className="text-sm text-gray-600">- <strong>Tip:</strong> For best results, run this agent{" "}++ {agent.description ? (+ <ShowMoreText+ previewLimit={400}+ variant="small"+ className="mt-4 !text-zinc-700"+ >+ {agent.description}+ </ShowMoreText>+ ) : null}++ {agent.recommended_schedule_cron && !agent.has_external_trigger ? (+ <div className="flex flex-col gap-4 rounded-medium border border-blue-100 bg-blue-50 p-4">+ <Text variant="lead-semibold" className="text-blue-600">+ Tip+ </Text>+ <Text variant="body">+ For best results, run this agent{" "}{humanizeCronExpression(agent.recommended_schedule_cron,).toLowerCase()}- </p>+ </Text></div>- )}-- {/* Setup Instructions */}- {agent.instructions && (- <div className="mt-4 flex items-start gap-2">- <InfoIcon className="mt-0.5 h-4 w-4 flex-shrink-0 text-gray-500" />- <div className="text-sm text-gray-600">- <strong>Setup Instructions:</strong>{" "}- <span className="whitespace-pre-wrap">{agent.instructions}</span>- </div>+ ) : null}++ {agent.instructions ? (+ <div className="flex flex-col gap-4 rounded-medium border border-purple-100 bg-[#F1EBFE/5] p-4">+ <Text variant="lead-semibold" className="text-purple-600">+ Instructions+ </Text>++ <div className="h-px w-full bg-purple-100" />++ <Text variant="body">{agent.instructions}</Text></div>- )}+ ) : null}</div></div>);diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsxindex f5d63852bf..d6fe7959b8 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalRunSection/ModalRunSection.tsx@@ -1,17 +1,13 @@import { CredentialsInput } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";import { Input } from "@/components/atoms/Input/Input";-import { Text } from "@/components/atoms/Text/Text";import { InformationTooltip } from "@/components/molecules/InformationTooltip/InformationTooltip";-import { toDisplayName } from "@/providers/agent-credentials/helper";-import { InfoIcon } from "@phosphor-icons/react";import { RunAgentInputs } from "../../../RunAgentInputs/RunAgentInputs";import { useRunAgentModalContext } from "../../context";+import { ModalSection } from "../ModalSection/ModalSection";import { WebhookTriggerBanner } from "../WebhookTriggerBanner/WebhookTriggerBanner";-import { getCredentialTypeDisplayName } from "./helpers";export function ModalRunSection() {const {- agent,defaultRunType,presetName,setPresetName,@@ -25,147 +21,104 @@ export function ModalRunSection() {agentCredentialsInputFields,} = useRunAgentModalContext();- return (- <div className="mb-10 mt-4">- {defaultRunType === "automatic-trigger" && <WebhookTriggerBanner />}-- {/* Preset/Trigger fields */}- {defaultRunType === "automatic-trigger" && (- <div className="flex flex-col gap-4">- <div className="flex flex-col space-y-2">- <label className="flex items-center gap-1 text-sm font-medium">- Trigger Name- <InformationTooltip description="Name of the trigger you are setting up" />- </label>- <Input- id="trigger_name"- label="Trigger Name"- size="small"- hideLabel- value={presetName}- placeholder="Enter trigger name"- onChange={(e) => setPresetName(e.target.value)}- />- </div>- <div className="flex flex-col space-y-2">- <label className="flex items-center gap-1 text-sm font-medium">- Trigger Description- <InformationTooltip description="Description of the trigger you are setting up" />- </label>- <Input- id="trigger_description"- label="Trigger Description"- size="small"- hideLabel- value={presetDescription}- placeholder="Enter trigger description"- onChange={(e) => setPresetDescription(e.target.value)}- />- </div>- </div>- )}+ const inputFields = Object.entries(agentInputFields || {});+ const credentialFields = Object.entries(agentCredentialsInputFields || {});- {/* Instructions */}- {agent.instructions && (- <div className="mb-4 flex items-start gap-2 rounded-md border border-blue-200 bg-blue-50 p-3">- <InfoIcon className="mt-0.5 h-4 w-4 text-blue-600" />- <div>- <h4 className="text-sm font-medium text-blue-900">- How to use this agent- </h4>- <p className="mt-1 whitespace-pre-wrap text-sm text-blue-800">- {agent.instructions}- </p>+ return (+ <div className="flex flex-col gap-4">+ {defaultRunType === "automatic-trigger" ? (+ <ModalSection+ title="Task Trigger"+ subtitle="Set up a trigger for the agent to run this task automatically"+ >+ <WebhookTriggerBanner />+ <div className="flex flex-col gap-4">+ <div className="flex flex-col space-y-2">+ <label className="flex items-center gap-1 text-sm font-medium">+ Trigger Name+ <InformationTooltip description="Name of the trigger you are setting up" />+ </label>+ <Input+ id="trigger_name"+ label="Trigger Name"+ size="small"+ hideLabel+ value={presetName}+ placeholder="Enter trigger name"+ onChange={(e) => setPresetName(e.target.value)}+ />+ </div>+ <div className="flex flex-col space-y-2">+ <label className="flex items-center gap-1 text-sm font-medium">+ Trigger Description+ <InformationTooltip description="Description of the trigger you are setting up" />+ </label>+ <Input+ id="trigger_description"+ label="Trigger Description"+ size="small"+ hideLabel+ value={presetDescription}+ placeholder="Enter trigger description"+ onChange={(e) => setPresetDescription(e.target.value)}+ />+ </div></div>- </div>- )}-- {/* Credentials inputs */}- {Object.entries(agentCredentialsInputFields || {}).map(- ([key, inputSubSchema]) => (- <CredentialsInput- key={key}- schema={{ ...inputSubSchema, discriminator: undefined } as any}- selectedCredentials={- (inputCredentials && inputCredentials[key]) ??- inputSubSchema.default- }- onSelectCredentials={(value) =>- setInputCredentialsValue(key, value)- }- siblingInputs={inputValues}- hideIfSingleCredentialAvailable={!agent.has_external_trigger}- />- ),- )}+ </ModalSection>+ ) : null}- {/* Regular inputs */}- {Object.entries(agentInputFields || {}).map(([key, inputSubSchema]) => (- <div key={key} className="flex w-full flex-col gap-0 space-y-2">- <label className="flex items-center gap-1 text-sm font-medium">- {inputSubSchema.title || key}- <InformationTooltip description={inputSubSchema.description} />- </label>+ {inputFields.length > 0 ? (+ <ModalSection+ title="Task Setup"+ subtitle="Enter the information needed for the agent to run this task"+ >+ {/* Regular inputs */}+ {inputFields.map(([key, inputSubSchema]) => (+ <div key={key} className="flex w-full flex-col gap-0 space-y-2">+ <label className="flex items-center gap-1 text-sm font-medium">+ {inputSubSchema.title || key}+ <InformationTooltip description={inputSubSchema.description} />+ </label>- <RunAgentInputs- schema={inputSubSchema}- value={inputValues[key] ?? inputSubSchema.default}- placeholder={inputSubSchema.description}- onChange={(value) => setInputValue(key, value)}- data-testid={`agent-input-${key}`}- />- </div>- ))}+ <RunAgentInputs+ schema={inputSubSchema}+ value={inputValues[key] ?? inputSubSchema.default}+ placeholder={inputSubSchema.description}+ onChange={(value) => setInputValue(key, value)}+ data-testid={`agent-input-${key}`}+ />+ </div>+ ))}+ </ModalSection>+ ) : null}- {/* Selected Credentials Preview */}- {Object.keys(inputCredentials).length > 0 && (- <div className="mt-6 flex flex-col gap-6">- {Object.entries(agentCredentialsInputFields || {}).map(- ([key, _sub]) => {- const credential = inputCredentials[key];- if (!credential) return null;-- return (- <div key={key} className="flex flex-col gap-4">- <Text variant="body-medium" as="h3">- {toDisplayName(credential.provider)} credentials- </Text>- <div className="flex flex-col gap-3">- <div className="flex items-center justify-between text-sm">- <Text- variant="body"- as="span"- className="!text-neutral-600"- >- Name- </Text>- <Text- variant="body"- as="span"- className="!text-neutral-600"- >- {getCredentialTypeDisplayName(credential.type)}- </Text>- </div>- <div className="flex items-center justify-between text-sm">- <Text- variant="body"- as="span"- className="!text-neutral-900"- >- {credential.title || "Untitled"}- </Text>- <span className="font-mono text-neutral-400">- {"*".repeat(25)}- </span>- </div>- </div>- </div>- );- },- )}- </div>- )}+ {credentialFields.length > 0 ? (+ <ModalSection+ title="Task Credentials"+ subtitle="These are the credentials the agent will use to perform this task"+ >+ <div className="space-y-6">+ {Object.entries(agentCredentialsInputFields || {}).map(+ ([key, inputSubSchema]) => (+ <CredentialsInput+ key={key}+ schema={+ { ...inputSubSchema, discriminator: undefined } as any+ }+ selectedCredentials={+ (inputCredentials && inputCredentials[key]) ??+ inputSubSchema.default+ }+ onSelectCredentials={(value) =>+ setInputCredentialsValue(key, value)+ }+ siblingInputs={inputValues}+ />+ ),+ )}+ </div>+ </ModalSection>+ ) : null}</div>);}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalSection/ModalSection.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalSection/ModalSection.tsxnew file mode 100644index 0000000000..db859ccfe7--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/ModalSection/ModalSection.tsx@@ -0,0 +1,21 @@+import { Text } from "@/components/atoms/Text/Text";++interface Props {+ title: string;+ subtitle: string;+ children: React.ReactNode;+}++export function ModalSection({ title, subtitle, children }: Props) {+ return (+ <div className="rounded-medium border border-zinc-200 p-6">+ <div className="mb-4 flex flex-col gap-1 border-b border-zinc-100 pb-4">+ <Text variant="lead-semibold">{title}</Text>+ <Text variant="body" className="text-zinc-500">+ {subtitle}+ </Text>+ </div>+ {children}+ </div>+ );+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/RunActions/RunActions.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/RunActions/RunActions.tsxindex e4b47a7ea4..3eb9514cc4 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/RunActions/RunActions.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/components/RunActions/RunActions.tsx@@ -26,7 +26,7 @@ export function RunActions({>{defaultRunType === "automatic-trigger"? "Set up Trigger"- : "Run Agent"}+ : "Start Task"}</Button></div>);diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/errorHelpers.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/errorHelpers.tsxnew file mode 100644index 0000000000..3b35e5cc21--- /dev/null+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/errorHelpers.tsx@@ -0,0 +1,100 @@+import { ApiError } from "@/lib/autogpt-server-api/helpers";+import Link from "next/link";+import React from "react";++type ValidationErrorDetail = {+ type: string;+ message?: string;+ node_errors?: Record<string, Record<string, string>>;+};++type AgentInfo = {+ graph_id: string;+ graph_version: number;+};++export function formatValidationError(+ error: any,+ agentInfo?: AgentInfo,+): string | React.ReactNode {+ if (+ !(error instanceof ApiError) ||+ !error.isGraphValidationError() ||+ !error.response?.detail+ ) {+ return error.message || "An unexpected error occurred.";+ }++ const detail: ValidationErrorDetail = error.response.detail;++ // Format validation errors nicely+ if (detail.type === "validation_error" && detail.node_errors) {+ const nodeErrors = detail.node_errors;+ const errorItems: React.ReactNode[] = [];++ // Collect all field errors+ Object.entries(nodeErrors).forEach(([nodeId, fields]) => {+ if (fields && typeof fields === "object") {+ Object.entries(fields).forEach(([fieldName, fieldError]) => {+ errorItems.push(+ <div key={`${nodeId}-${fieldName}`} className="mt-1">+ <span className="font-medium">{fieldName}:</span>{" "}+ {String(fieldError)}+ </div>,+ );+ });+ }+ });++ if (errorItems.length > 0) {+ return (+ <div className="space-y-1">+ <div className="font-medium text-white">+ {detail.message || "Validation failed"}+ </div>+ <div className="mt-2 space-y-1 text-xs">{errorItems}</div>+ {agentInfo && (+ <div className="mt-3 text-xs">+ Check the agent graph and try to run from there for further+ details.{" "}+ <Link+ href={`/build?flowID=${agentInfo.graph_id}&flowVersion=${agentInfo.graph_version}`}+ target="_blank"+ rel="noopener noreferrer"+ className="cursor-pointer underline hover:no-underline"+ >+ Open in builder+ </Link>+ </div>+ )}+ </div>+ );+ } else {+ return detail.message || "Validation failed";+ }+ }++ return detail.message || error.message || "An unexpected error occurred.";+}++export function showExecutionErrorToast(+ toast: (options: {+ title: string;+ description: string | React.ReactNode;+ variant: "destructive";+ duration: number;+ dismissable: boolean;+ }) => void,+ error: any,+ agentInfo?: AgentInfo,+) {+ const errorMessage = formatValidationError(error, agentInfo);++ toast({+ title: "Failed to execute agent",+ description: errorMessage,+ variant: "destructive",+ duration: 10000, // 10 seconds - long enough to read and close+ dismissable: true,+ });+}diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.ts b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsxsimilarity index 97%rename from autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsrename to autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsxindex f1920d66ad..20320427d4 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.ts+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/RunAgentModal/useAgentRunModal.tsx@@ -1,22 +1,23 @@-import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";-import { useState, useCallback, useMemo } from "react";-import { useQueryClient } from "@tanstack/react-query";-import { useToast } from "@/components/molecules/Toast/use-toast";-import { isEmpty } from "@/lib/utils";+import { useGetV1GetUserTimezone } from "@/app/api/__generated__/endpoints/auth/auth";import {- usePostV1ExecuteGraphAgent,getGetV1ListGraphExecutionsInfiniteQueryOptions,+ usePostV1ExecuteGraphAgent,} from "@/app/api/__generated__/endpoints/graphs/graphs";+import { usePostV2SetupTrigger } from "@/app/api/__generated__/endpoints/presets/presets";import {- usePostV1CreateExecutionSchedule as useCreateSchedule,getGetV1ListExecutionSchedulesForAGraphQueryKey,+ usePostV1CreateExecutionSchedule as useCreateSchedule,} from "@/app/api/__generated__/endpoints/schedules/schedules";-import { usePostV2SetupTrigger } from "@/app/api/__generated__/endpoints/presets/presets";-import { GraphExecutionMeta } from "@/app/api/__generated__/models/graphExecutionMeta";import { GraphExecutionJobInfo } from "@/app/api/__generated__/models/graphExecutionJobInfo";+import { GraphExecutionMeta } from "@/app/api/__generated__/models/graphExecutionMeta";+import { LibraryAgent } from "@/app/api/__generated__/models/libraryAgent";import { LibraryAgentPreset } from "@/app/api/__generated__/models/libraryAgentPreset";-import { useGetV1GetUserTimezone } from "@/app/api/__generated__/endpoints/auth/auth";+import { useToast } from "@/components/molecules/Toast/use-toast";+import { isEmpty } from "@/lib/utils";import { analytics } from "@/services/analytics";+import { useQueryClient } from "@tanstack/react-query";+import { useCallback, useMemo, useState } from "react";+import { showExecutionErrorToast } from "./errorHelpers";export type RunVariant =| "manual"@@ -85,14 +86,9 @@ export function useAgentRunModal(}},onError: (error: any) => {- const errorMessage = error.isGraphValidationError()- ? error.response.detail.message- : error.message;-- toast({- title: "❌ Failed to execute agent",- description: errorMessage || "An unexpected error occurred.",- variant: "destructive",+ showExecutionErrorToast(toast, error, {+ graph_id: agent.graph_id,+ graph_version: agent.graph_version,});},},diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/RunDetailCard/RunDetailCard.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/RunDetailCard/RunDetailCard.tsxindex d559faa654..f60c1bf934 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/RunDetailCard/RunDetailCard.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/RunDetailCard/RunDetailCard.tsx@@ -15,7 +15,13 @@ export function RunDetailCard({ children, className, title }: Props) {className,)}>- {title && <Text variant="lead-semibold">{title}</Text>}+ {title ? (+ typeof title === "string" ? (+ <Text variant="lead-semibold">{title}</Text>+ ) : (+ title+ )+ ) : null}{children}</div>);diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsxindex 72144bc5bd..7cce125e7c 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/selected-views/SelectedRunView/SelectedRunView.tsx@@ -129,7 +129,8 @@ export function SelectedRunView({<div id="summary" className="scroll-mt-4"><RunDetailCardtitle={- <div>+ <div className="flex items-center gap-2">+ <Text variant="lead-semibold">Summary</Text><TooltipProvider><Tooltip><TooltipTrigger asChild>diff --git a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsxindex 77cf28708b..0289bbdb5f 100644--- a/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/agent-run-draft-view.tsx@@ -40,8 +40,8 @@ import { cn, isEmpty } from "@/lib/utils";import { ClockIcon, CopyIcon, InfoIcon } from "@phosphor-icons/react";import { CalendarClockIcon, Trash2Icon } from "lucide-react";-import { AgentStatus, AgentStatusChip } from "./agent-status-chip";import { analytics } from "@/services/analytics";+import { AgentStatus, AgentStatusChip } from "./agent-status-chip";export function AgentRunDraftView({graph,@@ -674,9 +674,6 @@ export function AgentRunDraftView({prev.add("credentials"),);}}- hideIfSingleCredentialAvailable={- !agentPreset && !graph.has_external_trigger- }/>),)}diff --git a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsxindex c8b24b6d9f..7d8ead9df7 100644--- a/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx+++ b/autogpt_platform/frontend/src/app/(platform)/profile/(user)/integrations/page.tsx@@ -1,5 +1,5 @@"use client";-import { providerIcons } from "@/app/(platform)/library/agents/[id]/components/NewAgentLibraryView/components/modals/CredentialsInputs/CredentialsInputs";+import { IconKey, IconUser } from "@/components/__legacy__/ui/icons";import LoadingBox from "@/components/__legacy__/ui/loading";import {@@ -13,6 +13,7 @@ import {import { Button } from "@/components/atoms/Button/Button";import { Dialog } from "@/components/molecules/Dialog/Dialog";import { useToast } from "@/components/molecules/Toast/use-toast";+import { providerIcons } from "@/components/renderers/input-renderer/fields/CredentialField/helpers";import { CredentialsProviderName } from "@/lib/autogpt-server-api";import { useSupabase } from "@/lib/supabase/hooks/useSupabase";import { CredentialsProvidersContext } from "@/providers/agent-credentials/credentials-provider";diff --git a/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx b/autogpt_platform/frontend/src/components/atoms/Button/Button.tsxindex 29e86dd846..de1dec2d25 100644--- a/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx+++ b/autogpt_platform/frontend/src/components/atoms/Button/Button.tsx@@ -15,6 +15,7 @@ export function Button(props: ButtonProps) {variant,size,loading = false,+ withTooltip = true,leftIcon,rightIcon,children,@@ -28,7 +29,9 @@ export function Button(props: ButtonProps) {// Extract aria-label for tooltip on icon variantconst ariaLabel ="aria-label" in restProps ? restProps["aria-label"] : undefined;- const shouldShowTooltip = variant === "icon" && ariaLabel && !loading;++ const shouldShowTooltip =+ variant === "icon" && ariaLabel && !loading && withTooltip;// Helper to wrap button with tooltip if neededconst wrapWithTooltip = (buttonElement: React.ReactElement) => {diff --git a/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts b/autogpt_platform/frontend/src/components/atoms/Button/helpers.tsindex cc733d3df6..db7938661c 100644--- a/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts+++ b/autogpt_platform/frontend/src/components/atoms/Button/helpers.ts@@ -16,7 +16,7 @@ export const extendedButtonVariants = cva(primary:"bg-zinc-800 border-zinc-800 text-white hover:bg-zinc-900 hover:border-zinc-900 rounded-full disabled:text-white disabled:bg-zinc-200 disabled:border-zinc-200 disabled:opacity-1",secondary:- "bg-zinc-200 border-zinc-200 text-black hover:bg-zinc-400 hover:border-zinc-400 rounded-full disabled:text-zinc-300 disabled:bg-zinc-50 disabled:border-zinc-50 disabled:opacity-1",+ "bg-zinc-100 border-zinc-100 text-black hover:bg-zinc-300 hover:border-zinc-300 rounded-full disabled:text-zinc-300 disabled:bg-zinc-50 disabled:border-zinc-50 disabled:opacity-1",destructive:"bg-red-500 border-red-500 text-white hover:bg-red-600 hover:border-red-600 rounded-full disabled:text-white disabled:bg-zinc-200 disabled:border-zinc-200 disabled:opacity-1",outline:@@ -49,6 +49,7 @@ type BaseButtonProps = {leftIcon?: React.ReactNode;rightIcon?: React.ReactNode;asChild?: boolean;+ withTooltip?: boolean;} & VariantProps<typeof extendedButtonVariants>;type ButtonAsButton = BaseButtonProps &diff --git a/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx b/autogpt_platform/frontend/src/components/atoms/Input/Input.tsxindex 68ad12e522..f59c01e77d 100644--- a/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx+++ b/autogpt_platform/frontend/src/components/atoms/Input/Input.tsx@@ -92,7 +92,7 @@ export function Input({className={cn(baseStyles,errorStyles,- "-mb-1 h-auto min-h-[2.875rem]",+ "-mb-1 h-auto min-h-[2.875rem] rounded-medium",// Size variants for textareasize === "small" && ["min-h-[2.25rem]", // 36px minimum@@ -222,7 +222,7 @@ export function Input({) : (<label htmlFor={props.id} className="flex flex-col gap-2"><div className="flex items-center justify-between">- <Text variant="body-medium" as="span" className="text-black">+ <Text variant="large-medium" as="span" className="text-black">{label}</Text>{hint ? (diff --git a/autogpt_platform/frontend/src/components/atoms/Select/Select.tsx b/autogpt_platform/frontend/src/components/atoms/Select/Select.tsxindex eaa12f63df..cfbb869628 100644--- a/autogpt_platform/frontend/src/components/atoms/Select/Select.tsx+++ b/autogpt_platform/frontend/src/components/atoms/Select/Select.tsx@@ -1,15 +1,15 @@"use client";-import * as React from "react";import {Select as BaseSelect,SelectContent,SelectItem,+ SelectSeparator,SelectTrigger,SelectValue,- SelectSeparator,} from "@/components/__legacy__/ui/select";import { cn } from "@/lib/utils";+import * as React from "react";import { ReactNode } from "react";import { Text } from "../Text/Text";@@ -140,7 +140,7 @@ export function Select({) : (<label htmlFor={id} className="flex flex-col gap-2"><div className="flex items-center justify-between">- <Text variant="body-medium" as="span" className="text-black">+ <Text variant="large-medium" as="span" className="text-black">{label}</Text>{hint}diff --git a/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx b/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsxindex eaa44a9452..01b98bcdac 100644--- a/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx+++ b/autogpt_platform/frontend/src/components/contextual/GoogleDrivePicker/GoogleDrivePicker.tsx@@ -31,7 +31,6 @@ export function GoogleDrivePicker(props: Props) {schema={credentials.schema}selectedCredentials={selectedCredential}onSelectCredentials={setSelectedCredential}- hideIfSingleCredentialAvailable/>);}@@ -46,7 +45,6 @@ export function GoogleDrivePicker(props: Props) {schema={credentials.schema}selectedCredentials={selectedCredential}onSelectCredentials={setSelectedCredential}- hideIfSingleCredentialAvailable={false}/>)}<Buttondiff --git a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/AgentInfoStep.tsx b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/AgentInfoStep.tsxindex 18c00d35d7..3ec680ca95 100644--- a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/AgentInfoStep.tsx+++ b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/AgentInfoStep.tsx@@ -1,16 +1,17 @@"use client";-import * as React from "react";+import { CronExpressionDialog } from "@/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/cron-scheduler-dialog";+import { Form, FormField } from "@/components/__legacy__/ui/form";import { Button } from "@/components/atoms/Button/Button";-import { StepHeader } from "../StepHeader";import { Input } from "@/components/atoms/Input/Input";import { Select } from "@/components/atoms/Select/Select";-import { Form, FormField } from "@/components/__legacy__/ui/form";-import { CronExpressionDialog } from "@/app/(platform)/library/agents/[id]/components/OldAgentLibraryView/components/cron-scheduler-dialog";+import { Text } from "@/components/atoms/Text/Text";import { humanizeCronExpression } from "@/lib/cron-expression-utils";import { CalendarClockIcon } from "lucide-react";-import { Props, useAgentInfoStep } from "./useAgentInfoStep";+import * as React from "react";+import { StepHeader } from "../StepHeader";import { ThumbnailImages } from "./components/ThumbnailImages";+import { Props, useAgentInfoStep } from "./useAgentInfoStep";export function AgentInfoStep({onBack,@@ -197,10 +198,8 @@ export function AgentInfoStep({control={form.control}name="recommendedScheduleCron"render={({ field }) => (- <div className="flex flex-col space-y-2">- <label className="text-sm font-medium">- Recommended Schedule- </label>+ <div className="mb-8 flex flex-col space-y-2">+ <Text variant="large-medium">Recommended Schedule</Text><p className="text-xs text-gray-600">Suggest when users should run this agent for best results</p>diff --git a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/components/ThumbnailImages.tsx b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/components/ThumbnailImages.tsxindex 723eb5d640..f2f8cf79fc 100644--- a/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/components/ThumbnailImages.tsx+++ b/autogpt_platform/frontend/src/components/contextual/PublishAgentModal/components/AgentInfoStep/components/ThumbnailImages.tsx@@ -1,12 +1,11 @@"use client";-import * as React from "react";-import Image from "next/image";-import { IconCross, IconPlus } from "../../../../../__legacy__/ui/icons";import { Button } from "@/components/atoms/Button/Button";+import { Text } from "@/components/atoms/Text/Text";import { MagicWand } from "@phosphor-icons/react";+import Image from "next/image";+import { IconCross, IconPlus } from "../../../../../__legacy__/ui/icons";import { useThumbnailImages } from "./useThumbnailImages";-import { Text } from "@/components/atoms/Text/Text";interface ThumbnailImagesProps {agentId: string | null;@@ -43,9 +42,9 @@ export function ThumbnailImages({return (<div className="space-y-2.5"><div className="flex flex-col items-start justify-start gap-1">- <label className="text-sm font-medium leading-tight text-slate-950">+ <Text variant="large-medium" className="leading-tight">Thumbnail images- </label>+ </Text><Text variant="body" className="!text-zinc-500">The first image will be used as the thumbnail for your agent.</Text>@@ -68,7 +67,7 @@ export function ThumbnailImages({</div><divref={thumbnailsContainerRef}- className="flex items-center space-x-2 overflow-x-auto pb-6"+ className="relative z-10 flex items-center space-x-2 pb-4">{images.length === 0 ? (<div className="flex w-full items-center justify-start gap-2 pl-2">@@ -108,15 +107,13 @@ export function ThumbnailImages({key={index}className="relative flex-shrink-0 overflow-visible">- <Button- type="button"- size="small"+ <buttononClick={() => handleRemoveImage(index)}- className="absolute right-0 top-0 z-50 h-6 w-6 p-0"+ className="absolute -right-2 -top-2 z-50 inline-flex size-6 items-center justify-center rounded-full bg-slate-900"aria-label="Remove image"><IconCross className="h-2 w-2 text-white" />- </Button>+ </button><divclassName={`relative aspect-video h-16 w-24 overflow-hidden rounded-md border-2 transition-colors ${selectedImage === srcdiff --git a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsxindex ae4dc8e065..de1984b449 100644--- a/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx+++ b/autogpt_platform/frontend/src/components/molecules/Dialog/components/DialogWrap.tsx@@ -1,3 +1,5 @@+import { Button } from "@/components/atoms/Button/Button";+import { scrollbarStyles } from "@/components/styles/scrollbars";import { cn } from "@/lib/utils";import { X } from "@phosphor-icons/react";import * as RXDialog from "@radix-ui/react-dialog";@@ -11,7 +13,6 @@ import {} from "react";import { DialogCtx } from "../useDialogCtx";import { modalStyles } from "./styles";-import { scrollbarStyles } from "@/components/styles/scrollbars";type BaseProps = DialogCtx & PropsWithChildren;@@ -111,13 +112,16 @@ export function DialogWrap({)}{isForceOpen && !handleClose ? null : (- <button+ <Button+ variant="icon"+ size="icon"onClick={handleClose}aria-label="Close"- className="absolute right-4 top-4 z-50 hover:border-transparent hover:bg-transparent focus:border-none focus:outline-none"+ className="absolute right-4 top-4 z-50 size-[2.5rem] bg-white"+ withTooltip={false}>- <X className={modalStyles.icon} />- </button>+ <X width="1rem" />+ </Button>)}</div><div className="flex min-h-0 flex-1 flex-col">