Skip to content

armgit / dify

Public Imported from GitHub
0

Build Agentic workflows, RAG pipelines, with rich AI model and tool support on one collaborative workspace. Deploy on cloud, VPC, or self-hosted, so teams move from prototype to production without rebuilding the stack.

fix(web): keep agent configure model selection explicit (#42488)

yyh5fa40f1a5f5c
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx
index 2535bc36a03..d23c1665984 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/__tests__/index.spec.tsx
@@ -351,6 +351,20 @@ describe('ModelParameterModal', () => {
expect(screen.getByTestId('model-selector')).toBeInTheDocument()
})
+ it('exposes popup state on the settings button and restores focus after Escape', async () => {
+ const user = userEvent.setup()
+ render(<ModelParameterModal {...defaultProps} />)
+ const trigger = screen.getByRole('button', { name: /modelProvider\.modelSettings/i })
+ expect(trigger).not.toHaveAttribute('data-popup-open')
+ await user.click(trigger)
+ expect(trigger).toHaveAttribute('data-popup-open', '')
+ await user.keyboard('{Escape}')
+ await waitFor(() => {
+ expect(trigger).toHaveAttribute('aria-expanded', 'false')
+ })
+ expect(trigger).toHaveFocus()
+ })
+
it('should not open content when readonly is true', () => {
render(<ModelParameterModal {...defaultProps} readonly />)
expect(screen.getByRole('button', { name: /modelProvider\.modelSettings/i })).toBeDisabled()
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
index cfc62826278..cdb1b03c9d9 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/index.tsx
@@ -58,6 +58,7 @@ export type ModelParameterModalProps = Pick<PopoverContentProps, 'placement'> &
nodesOutputVars?: NodeOutPutVar[]
availableNodes?: Node[]
modelList?: ModelSelectorProvider[]
+ modelListLoading?: boolean
showModelMeta?: boolean
modelPredicate?: ModelSelectorModelPredicate
modelSuggestionPredicate?: ModelSelectorModelPredicate
@@ -84,6 +85,7 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
nodesOutputVars,
availableNodes,
modelList,
+ modelListLoading,
showModelMeta,
modelPredicate,
modelSuggestionPredicate,
@@ -173,6 +175,7 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
<SplitModelSelector
value={hasSelectedModel ? { provider, model: modelId } : undefined}
models={selectableModelList}
+ loading={modelListLoading}
popupClassName={modelSelectorPopupClassName}
disabled={readonly || modelSelectorReadonly}
showModelMeta={showModelMeta}
@@ -215,6 +218,7 @@ const ModelParameterModal: FC<ModelParameterModalProps> = ({
<ModelSelector
value={hasSelectedModel ? { provider, model: modelId } : undefined}
models={selectableModelList}
+ loading={modelListLoading}
disabled={modelSelectorReadonly}
onValueChange={handleChangeModel}
onHide={() => setOpen(false)}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-settings-trigger.tsx b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-settings-trigger.tsx
index 57d15d5a39c..e536813927c 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-settings-trigger.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-parameter-modal/model-settings-trigger.tsx
@@ -22,7 +22,7 @@ function ModelSettingsTrigger({ disabled, surface = 'default' }: ModelSettingsTr
render={
<IconButton
aria-label={label}
- className="relative shrink-0 rounded-l-none! rounded-r-lg! focus-visible:z-1 data-[surface=workflow]:bg-workflow-block-parma-bg data-[surface=workflow]:hover:bg-workflow-block-parma-bg"
+ className="relative shrink-0 rounded-l-none! rounded-r-lg! focus-visible:z-1 data-popup-open:bg-components-button-tertiary-bg-hover data-[surface=workflow]:bg-workflow-block-parma-bg data-[surface=workflow]:hover:bg-workflow-block-parma-bg"
data-surface={surface}
disabled={disabled}
size="lg"
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx
index 3624663f677..21777436d45 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/__tests__/model-selector-trigger.spec.tsx
@@ -63,7 +63,7 @@ const createModel = (
describe('ModelSelectorTrigger', () => {
beforeEach(() => {
vi.clearAllMocks()
- mockUseQuery.mockReturnValue({ data: createModel() })
+ mockUseQuery.mockReturnValue({ data: { data: [createModel()] } })
mockUseCredentialPanelState.mockReturnValue({
variant: 'credits-active',
priority: 'credits',
@@ -76,6 +76,33 @@ describe('ModelSelectorTrigger', () => {
})
})
+ it('keeps an existing model neutral while its catalog is unresolved', () => {
+ const { rerender } = render(
+ <ModelSelectorTrigger loading defaultModel={{ provider: 'openai', model: 'legacy-model' }} />,
+ )
+ expect(screen.getByRole('button', { name: 'legacy-model' })).toBeDisabled()
+ expect(screen.queryByText('common.modelProvider.selector.incompatible')).not.toBeInTheDocument()
+ rerender(
+ <Popover>
+ <ModelSelectorTrigger defaultModel={{ provider: 'openai', model: 'legacy-model' }} />
+ </Popover>,
+ )
+ expect(
+ screen.getByRole('button', {
+ name: 'legacy-model common.modelProvider.selector.incompatible',
+ }),
+ ).toBeEnabled()
+ })
+
+ it('does not report incompatibility before provider metadata is available', () => {
+ mockUseQuery.mockReturnValue({ data: undefined })
+ render(
+ <ModelSelectorTrigger currentProvider={createModel()} currentModel={createModelItem()} />,
+ )
+ expect(screen.getByRole('button', { name: 'GPT-4' })).toBeEnabled()
+ expect(screen.queryByText('common.modelProvider.selector.incompatible')).not.toBeInTheDocument()
+ })
+
describe('Rendering', () => {
it('should render empty state when no model is selected', () => {
render(<ModelSelectorTrigger />)
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
index 6b67372ebae..03194f327a4 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/index.tsx
@@ -33,6 +33,7 @@ type ModelSelectorBaseProps = {
onValueChange?: (model: ModelSelectorValue) => void
onHide?: () => void
disabled?: boolean
+ loading?: boolean
scopeFeatures?: readonly string[]
showDeprecatedWarnIcon?: boolean
hideProviderSettingsFooter?: boolean
@@ -58,6 +59,7 @@ function ModelSelectorRoot({
onValueChange,
onHide,
disabled,
+ loading,
size,
surface,
shape,
@@ -85,12 +87,12 @@ function ModelSelectorRoot({
const handleOpenChange = useCallback(
(newOpen: boolean) => {
- if (disabled && newOpen) return
+ if ((disabled || loading) && newOpen) return
setOpen(newOpen)
if (!newOpen) setInputValue('')
},
- [disabled],
+ [disabled, loading],
)
const handleSelect = useCallback(
@@ -140,7 +142,8 @@ function ModelSelectorRoot({
currentProvider={currentProvider}
currentModel={currentModel}
defaultModel={value}
- disabled={disabled}
+ disabled={disabled || loading}
+ loading={loading}
size={size}
surface={surface}
shape={shape}
diff --git a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
index 1de9301f240..0148368e5ac 100644
--- a/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
+++ b/web/app/components/header/account-setting/model-provider-page/model-selector/model-selector-trigger.tsx
@@ -19,6 +19,7 @@ type ModelSelectorTriggerProps = {
currentModel?: ModelSelectorModel
defaultModel?: ModelSelectorValue
disabled?: boolean
+ loading?: boolean
size?: 'small' | 'medium'
surface?: 'default' | 'workflow'
shape?: 'standalone' | 'split'
@@ -33,6 +34,7 @@ function ModelSelectorTrigger({
currentModel,
defaultModel,
disabled,
+ loading = false,
size = 'medium',
surface = 'default',
shape = 'standalone',
@@ -47,63 +49,67 @@ function ModelSelectorTrigger({
const isDeprecated = !isSelected && !!defaultModel
const isEmpty = !isSelected && !defaultModel
const providerId = isSelected ? currentProvider.provider : defaultModel?.provider
- const { data: resolvedProvider } = useQuery({
+ const { data: providerSummary } = useQuery({
...consoleQuery.workspaces.current.modelProviders.summary.get.queryOptions(),
enabled: !!providerId,
- select: ({ data }) => data.find((provider) => provider.provider === providerId),
})
+ const resolvedProvider = providerSummary?.data.find(
+ (provider) => provider.provider === providerId,
+ )
+ const isStatusUnavailable = loading || (!!providerId && providerSummary === undefined)
+ const isDisabled = disabled || loading
const credentialPanel = useCredentialPanelInfo(resolvedProvider)
- const status = deriveModelStatus(
- isSelected ? currentModel?.model : defaultModel?.model,
- isSelected ? currentProvider?.provider : defaultModel?.provider,
- resolvedProvider,
- currentModel,
- credentialPanel,
- )
+ const status = isStatusUnavailable
+ ? undefined
+ : deriveModelStatus(
+ isSelected ? currentModel?.model : defaultModel?.model,
+ isSelected ? currentProvider?.provider : defaultModel?.provider,
+ resolvedProvider,
+ currentModel,
+ credentialPanel,
+ )
const isActive = status === 'active'
const statusI18nKey =
DERIVED_MODEL_STATUS_BADGE_I18N[status as keyof typeof DERIVED_MODEL_STATUS_BADGE_I18N]
const tooltipI18nKey =
DERIVED_MODEL_STATUS_TOOLTIP_I18N[status as keyof typeof DERIVED_MODEL_STATUS_TOOLTIP_I18N]
- const statusLabel =
- isModelCompatible && statusI18nKey
+ const statusLabel = !isModelCompatible
+ ? t(($) => $['modelProvider.selector.incompatible'], { ns: 'common' })
+ : statusI18nKey
? t(($) => $[statusI18nKey], { ns: 'common' })
- : t(($) => $['modelProvider.selector.incompatible'], { ns: 'common' })
- const tooltipLabel =
- isModelCompatible && tooltipI18nKey
+ : undefined
+ const tooltipLabel = !isModelCompatible
+ ? t(($) => $['modelProvider.selector.incompatibleTip'], { ns: 'common' })
+ : tooltipI18nKey
? t(($) => $[tooltipI18nKey], { ns: 'common' })
- : t(($) => $['modelProvider.selector.incompatibleTip'], { ns: 'common' })
+ : statusLabel
const isCreditsExhausted = status === 'credits-exhausted'
const shouldShowModelMeta = showModelMeta && status === 'active' && isModelCompatible
- const deprecatedStatusLabel =
- statusLabel || t(($) => $['modelProvider.selector.incompatible'], { ns: 'common' })
- const deprecatedTooltipLabel =
- tooltipLabel || t(($) => $['modelProvider.selector.incompatibleTip'], { ns: 'common' })
const triggerTooltipLabel =
- isDeprecated && showDeprecatedWarnIcon
- ? deprecatedTooltipLabel
- : isSelected && ((!isActive && statusI18nKey) || !isModelCompatible)
+ isDeprecated && !isStatusUnavailable && showDeprecatedWarnIcon
+ ? tooltipLabel
+ : isSelected && !isStatusUnavailable && ((!isActive && statusI18nKey) || !isModelCompatible)
? tooltipLabel
: undefined
return (
<Tooltip>
<TooltipTrigger
- disabled={!triggerTooltipLabel || disabled}
+ disabled={!triggerTooltipLabel || isDisabled}
render={
<PopoverTrigger
- disabled={disabled}
+ disabled={isDisabled}
render={
<button
type="button"
- data-deprecated={isDeprecated ? '' : undefined}
+ data-deprecated={isDeprecated && !isStatusUnavailable ? '' : undefined}
data-model-status={status}
data-shape={shape}
data-size={size}
data-surface={surface}
- disabled={disabled}
+ disabled={isDisabled}
className={cn(
'group/model-selector-trigger flex w-full min-w-0 items-center border-0 bg-components-input-bg-normal text-left text-components-input-text-filled outline-hidden transition-colors',
'hover:bg-state-base-hover-alt focus-visible:bg-state-base-hover-alt focus-visible:ring-2 focus-visible:ring-state-accent-solid data-popup-open:bg-state-base-hover-alt',
@@ -153,14 +159,19 @@ function ModelSelectorTrigger({
<ModelName
className="grow"
modelItem={currentModel}
- nameClassName={currentModel?.deprecated ? 'line-through' : undefined}
+ nameClassName={
+ currentModel?.deprecated && !isStatusUnavailable ? 'line-through' : undefined
+ }
showMode={shouldShowModelMeta}
showFeatures={shouldShowModelMeta}
/>
)}
{isDeprecated && (
<span
- className="grow truncate system-sm-regular text-components-input-text-filled line-through"
+ className={cn(
+ 'grow truncate system-sm-regular text-components-input-text-filled',
+ !isStatusUnavailable && 'line-through',
+ )}
title={defaultModel.model}
>
{defaultModel.model}
@@ -173,7 +184,8 @@ function ModelSelectorTrigger({
)}
{isSelected &&
- !disabled &&
+ !isDisabled &&
+ !isStatusUnavailable &&
((!isActive && statusI18nKey) || !isModelCompatible) && (
<span
className={cn(
@@ -188,17 +200,17 @@ function ModelSelectorTrigger({
</span>
)}
- {isDeprecated && showDeprecatedWarnIcon && (
+ {isDeprecated && !isStatusUnavailable && showDeprecatedWarnIcon && (
<span className="flex shrink-0 items-center gap-0.75 rounded-md border border-text-warning bg-components-badge-bg-dimm px-1.25 py-0.5">
<span aria-hidden className="i-ri-alert-fill size-3 text-text-warning" />
<span className="system-xs-medium whitespace-nowrap text-text-warning">
- {deprecatedStatusLabel}
+ {statusLabel}
</span>
</span>
)}
</span>
</span>
- {!disabled && shape !== 'split' && (isActive || isEmpty) && (
+ {!isDisabled && shape !== 'split' && (isActive || isEmpty) && (
<span
aria-hidden="true"
className="i-ri-arrow-down-s-line size-4 shrink-0 text-text-quaternary transition-colors group-hover/model-selector-trigger:text-text-secondary group-data-popup-open/model-selector-trigger:text-text-secondary"
diff --git a/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx b/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
index 4b25a75e47c..c4f75f463b5 100644
--- a/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
+++ b/web/app/components/workflow/nodes/agent-v2/components/agent-orchestrate-panel-content.tsx
@@ -23,10 +23,7 @@ import { useCallback, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
import { LoadingPlaceholder } from '@/app/components/base/loading-placeholder'
import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
-import {
- useDefaultModel,
- useTextGenerationCurrentProviderAndModelAndModelList,
-} from '@/app/components/header/account-setting/model-provider-page/hooks'
+import { useDefaultModel } from '@/app/components/header/account-setting/model-provider-page/hooks'
import { toast } from '@/app/notifications'
import {
agentSoulConfigToFormState,
@@ -158,8 +155,7 @@ function WorkflowRosterAgentOrchestratePanelContentInner({
} | null
}
}) {
- const { currentModel, setConfigureModel, textGenerationModelList } =
- useAgentOrchestrateModelOptions()
+ const { currentModel, setConfigureModel } = useAgentOrchestrateModelOptions()
return (
<AgentOrchestratePanel
@@ -167,7 +163,6 @@ function WorkflowRosterAgentOrchestratePanelContentInner({
agentSoulConfig={agentSoulConfig}
agentName={composerState?.agent?.name}
currentModel={currentModel}
- textGenerationModelList={textGenerationModelList}
readOnly
showHeader={false}
showPublishBar={false}
@@ -325,8 +320,7 @@ function WorkflowInlineAgentConfigureWorkspaceContent({
const resetConversation = useSetAtom(resetAgentConfigureConversationAtom)
const setConversationId = useSetAtom(setAgentConfigureConversationIdAtom)
const rebaseComposerDraft = useSetAtom(rebaseAgentComposerDraftAtom)
- const { currentModel, setConfigureModel, textGenerationModelList } =
- useAgentOrchestrateModelOptions()
+ const { currentModel, setConfigureModel } = useAgentOrchestrateModelOptions()
const [isApplyingInlineBuildDraft, setIsApplyingInlineBuildDraft] = useState(false)
const { saveAgentSoulConfig, saveDraft } = useWorkflowInlineAgentConfigureSync({
nodeId,
@@ -687,7 +681,6 @@ function WorkflowInlineAgentConfigureWorkspaceContent({
agentSoulConfig={buildDraft.agentSoulConfig}
agentName={composerState?.agent?.name}
currentModel={currentModel}
- textGenerationModelList={textGenerationModelList}
readOnly={buildDraft.isActive}
isBuildDraftActive={buildDraft.isActive}
buildDraftChangedKeys={buildDraft.changedKeys}
@@ -867,12 +860,9 @@ function useAgentOrchestrateModelOptions() {
}
: undefined
const currentModel = model ?? defaultModel
- const { textGenerationModelList } =
- useTextGenerationCurrentProviderAndModelAndModelList(currentModel)
return {
currentModel,
setConfigureModel: setModel,
- textGenerationModelList,
}
}
diff --git a/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx b/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx
index 56cbe85f94e..e9673e63cee 100644
--- a/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/__tests__/page.spec.tsx
@@ -976,6 +976,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -990,6 +991,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -1091,6 +1093,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -1105,6 +1108,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -1387,7 +1391,9 @@ describe('AgentConfigurePage', () => {
mocks.checkoutBuildDraft.mockRejectedValueOnce(new Error('checkout failed'))
mocks.queryState.composer = {
data: {
- agent_soul: {},
+ agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
+ },
},
isFetching: false,
isError: false,
@@ -1840,7 +1846,9 @@ describe('AgentConfigurePage', () => {
mocks.checkoutBuildDraft.mockRejectedValueOnce(new Error('checkout failed'))
mocks.queryState.composer = {
data: {
- agent_soul: {},
+ agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
+ },
},
isFetching: false,
isError: false,
@@ -2010,6 +2018,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2024,6 +2033,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2066,6 +2076,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2080,6 +2091,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2244,6 +2256,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2311,9 +2324,8 @@ describe('AgentConfigurePage', () => {
expect(screen.getByRole('button', { name: 'discard build draft' })).toBeDisabled()
})
- it('should block build chat checkout when no model is configured', async () => {
+ it('should require an explicit model even when the workspace has a default', async () => {
const queryClient = createQueryClient()
- modelHooksState.defaultTextGenerationModel = undefined
mocks.queryState.composer = {
data: {
agent_soul: {
@@ -2364,6 +2376,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2378,6 +2391,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2431,6 +2445,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2445,6 +2460,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2494,6 +2510,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2580,6 +2597,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2594,6 +2612,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2643,6 +2662,7 @@ describe('AgentConfigurePage', () => {
refetchBuildDraft.mockReturnValueOnce(staleRefresh.promise)
mocks.checkoutBuildDraft.mockResolvedValue({
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2653,6 +2673,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.composer = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'draft prompt',
},
@@ -2667,6 +2688,7 @@ describe('AgentConfigurePage', () => {
mocks.queryState.buildDraft = {
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'build prompt',
},
@@ -2707,6 +2729,7 @@ describe('AgentConfigurePage', () => {
staleRefresh.resolve({
data: {
agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
prompt: {
system_prompt: 'stale refreshed prompt',
},
@@ -2736,7 +2759,9 @@ describe('AgentConfigurePage', () => {
}
mocks.queryState.buildDraft = {
data: {
- agent_soul: {},
+ agent_soul: {
+ model: { model_provider: 'langgenius/openai/openai', model: 'gpt-4o-mini' },
+ },
draft: {},
variant: 'agent_app',
},
diff --git a/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx b/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx
index 2235abfbf99..9f1196c6a95 100644
--- a/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/__tests__/use-agent-configure-sync.spec.tsx
@@ -243,7 +243,7 @@ function renderUseAgentConfigureSync({
}: {
agentName?: Parameters<typeof useAgentConfigureSync>[0]['agentName']
baseConfig?: Parameters<typeof useAgentConfigureSync>[0]['baseConfig']
- currentModel?: Parameters<typeof useAgentConfigureSync>[0]['currentModel']
+ currentModel?: AgentSoulConfigFormState['model']
enabled?: boolean
publishEnabled?: boolean
suspend?: boolean
@@ -259,6 +259,11 @@ function renderUseAgentConfigureSync({
createAgentFixture(),
)
const store = createStore()
+ const initialDraft = currentModel
+ ? { ...defaultAgentSoulConfigFormState, model: currentModel }
+ : defaultAgentSoulConfigFormState
+ store.set(agentComposerDraftAtom, initialDraft)
+ store.set(agentComposerSavedDraftAtom, initialDraft)
const pendingRender = new Promise<void>(() => {})
const wrapper = ({ children }: PropsWithChildren) => (
<QueryClientProvider client={queryClient}>
@@ -275,7 +280,6 @@ function renderUseAgentConfigureSync({
agentId: 'agent-1',
agentName: props.agentName,
baseConfig: props.baseConfig,
- currentModel: props.currentModel,
enabled: props.enabled,
publishEnabled: publishEnabled ?? props.enabled,
})
@@ -365,7 +369,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Draft only prompt',
})
})
@@ -439,7 +443,7 @@ describe('useAgentConfigureSync', () => {
rerender(nextProps)
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Draft while the next configuration is pending',
})
})
@@ -466,8 +470,9 @@ describe('useAgentConfigureSync', () => {
rerender({ ...nextProps, suspend: false })
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Draft after the next configuration commits',
+ model: nextProps.currentModel,
})
})
await act(async () => {
@@ -501,7 +506,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Temporary prompt',
})
})
@@ -528,7 +533,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Closing prompt',
})
})
@@ -585,7 +590,7 @@ describe('useAgentConfigureSync', () => {
rerender(disabledProps)
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Committed draft before closing',
})
})
@@ -610,7 +615,7 @@ describe('useAgentConfigureSync', () => {
rerender({ ...disabledProps, suspend: false })
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Disabled draft after commit',
})
})
@@ -629,7 +634,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Explicit save prompt',
})
})
@@ -645,7 +650,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Latest closing prompt',
})
})
@@ -686,7 +691,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Pending explicit save',
})
})
@@ -722,7 +727,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Route leave prompt',
})
})
@@ -760,7 +765,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Switching prompt',
})
})
@@ -789,7 +794,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
files: [
{
id: 'uploaded.md',
@@ -923,7 +928,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
knowledgeRetrievals: [
{
id: 'retrieval-1',
@@ -947,7 +952,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Unsaved autosave prompt',
})
})
@@ -967,7 +972,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Run prompt',
})
})
@@ -1001,7 +1006,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Run prompt',
})
})
@@ -1031,6 +1036,51 @@ describe('useAgentConfigureSync', () => {
})
})
+ it('saves a newly selected model from the draft without waiting for a render', async () => {
+ const { result, store } = renderUseAgentConfigureSync()
+ await act(async () => {
+ store.set(agentComposerDraftAtom, {
+ ...store.get(agentComposerDraftAtom),
+ model: configuredModel,
+ })
+ await result.current.saveDraft()
+ })
+ expect(composerPutMutationFn).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.objectContaining({
+ agent_soul: expect.objectContaining({
+ model: expect.objectContaining({
+ model_provider: configuredModel.provider,
+ model: configuredModel.model,
+ }),
+ }),
+ }),
+ }),
+ )
+ })
+
+ it('autosaves prompt edits without choosing a model and blocks publishing', async () => {
+ const { result, store } = renderUseAgentConfigureSync()
+ act(() => {
+ store.set(agentComposerPromptAtom, 'New prompt')
+ })
+ await act(async () => {
+ await vi.advanceTimersByTimeAsync(5000)
+ })
+ expect(composerPutMutationFn).toHaveBeenCalledWith(
+ expect.objectContaining({
+ body: expect.objectContaining({
+ agent_soul: expect.objectContaining({ model: undefined }),
+ }),
+ }),
+ )
+ await act(async () => {
+ await result.current.publishDraft()
+ })
+ expect(publishAgentMutationFn).not.toHaveBeenCalled()
+ expect(toastMock.error).toHaveBeenCalledWith('common.modelProvider.selectModel')
+ })
+
it('should save the effective model before run when the form draft is unchanged', async () => {
const { result } = renderUseAgentConfigureSync({
baseConfig: {
@@ -1069,7 +1119,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
knowledgeRetrievals: [
{
id: 'retrieval-1',
@@ -1093,7 +1143,7 @@ describe('useAgentConfigureSync', () => {
})
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Published prompt',
})
})
@@ -1138,7 +1188,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Published prompt',
})
})
@@ -1163,7 +1213,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
tools: [
{
id: 'langgenius/jina_tool/jina',
@@ -1199,7 +1249,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
tools: [
{
id: 'google',
@@ -1228,13 +1278,13 @@ describe('useAgentConfigureSync', () => {
)
})
- it('should keep default model fallback from leaving the local draft dirty after publish', async () => {
+ it('should keep the selected draft model clean after publish', async () => {
const { result, store } = renderUseAgentConfigureSync({
currentModel: configuredModel,
})
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Published prompt',
})
})
@@ -1245,8 +1295,8 @@ describe('useAgentConfigureSync', () => {
expect(publishAgentMutationFn).toHaveBeenCalledTimes(1)
const savedDraft = store.get(agentComposerSavedDraftAtom)
- expect(store.get(agentComposerDraftAtom).model).toBeUndefined()
- expect(savedDraft?.model).toBeUndefined()
+ expect(store.get(agentComposerDraftAtom).model).toEqual(configuredModel)
+ expect(savedDraft?.model).toEqual(configuredModel)
expect(savedDraft).toEqual(store.get(agentComposerDraftAtom))
})
@@ -1263,7 +1313,7 @@ describe('useAgentConfigureSync', () => {
})
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Published prompt',
})
})
@@ -1286,7 +1336,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Current draft prompt',
})
})
@@ -1318,7 +1368,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Unpublished prompt',
})
})
@@ -1386,7 +1436,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
knowledgeRetrievals: [
{
id: 'retrieval-1',
@@ -1415,7 +1465,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
knowledgeRetrievals: [
{
id: 'retrieval-1',
@@ -1477,7 +1527,7 @@ describe('useAgentConfigureSync', () => {
})
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Draft captured for publish',
})
})
@@ -1495,7 +1545,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Edited while publish is pending',
})
})
@@ -1536,7 +1586,7 @@ describe('useAgentConfigureSync', () => {
})
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Draft captured for publish',
})
})
@@ -1553,7 +1603,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Latest edit before closing',
})
})
@@ -1598,7 +1648,7 @@ describe('useAgentConfigureSync', () => {
})
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Draft captured for failed publish',
})
})
@@ -1614,7 +1664,7 @@ describe('useAgentConfigureSync', () => {
act(() => {
store.set(agentComposerDraftAtom, {
- ...defaultAgentSoulConfigFormState,
+ ...store.get(agentComposerDraftAtom),
prompt: 'Edited while failed publish is pending',
})
})
diff --git a/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx b/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx
index e6173eff6e7..0cf1139cd32 100644
--- a/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/composer-session.tsx
@@ -9,7 +9,7 @@ import type { useAgentConfigureData } from '../hooks'
import type { AgentConfigureRightPanelMode } from '../state'
import type { AgentPreviewChatController } from './preview/chat-conversation'
import { useMutation, useQueryClient } from '@tanstack/react-query'
-import { useAtomValue, useSetAtom } from 'jotai'
+import { useAtom, useAtomValue, useSetAtom } from 'jotai'
import { ScopeProvider } from 'jotai-scope'
import { useCallback, useEffect, useRef, useState } from 'react'
import { useTranslation } from 'react-i18next'
@@ -18,13 +18,13 @@ import { toast } from '@/app/notifications'
import { agentSoulConfigToFormState } from '@/features/agent-v2/agent-composer/conversions'
import { AgentComposerProvider } from '@/features/agent-v2/agent-composer/provider'
import { rebaseAgentComposerDraftAtom } from '@/features/agent-v2/agent-composer/store'
+import { agentComposerModelAtom } from '@/features/agent-v2/agent-composer/store-modules/model'
import {
AgentScope,
trackAgentBuildModeRun,
trackAgentPreviewModeRun,
} from '@/features/agent-v2/analytics'
import { consoleQuery } from '@/service/console'
-import { useAgentConfigureModelOptions } from '../hooks'
import {
agentConfigureConversationIdsAtom,
agentConfigureShowChatFeaturesAtom,
@@ -349,13 +349,11 @@ function AgentConfigurePageComposerContent({
},
[rebaseComposerDraft],
)
- const { currentModel, setConfigureModel, textGenerationModelList } =
- useAgentConfigureModelOptions()
+ const [currentModel, setConfigureModel] = useAtom(agentComposerModelAtom)
const { isPublishing, publishDraft, saveDraft } = useAgentConfigureSync({
agentId,
agentName: agentQuery.data?.name,
baseConfig: agentSoulConfig,
- currentModel,
enabled:
capabilities.canEdit && composerQuery.isSuccess && !selectedVersionId && !buildDraft.isActive,
publishEnabled:
@@ -484,7 +482,6 @@ function AgentConfigurePageComposerContent({
agentSoulConfig={buildDraft.agentSoulConfig}
agentName={agentQuery.data?.name}
currentModel={currentModel}
- textGenerationModelList={textGenerationModelList}
isPublishing={isPublishing}
readOnly={
!capabilities.canEdit ||
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/index.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/index.tsx
index 1ea6f6c76c9..0ddffd2dc8c 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/index.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/index.tsx
@@ -6,7 +6,6 @@ import type {
} from '@dify/contracts/api/console/agent/types.gen'
import type { ReactNode } from 'react'
import type { AgentBuildDraftChangedKey } from './build-draft-changes-context'
-import type { ModelSelectorProvider } from '@/app/components/header/account-setting/model-provider-page/model-selector/types'
import type { AgentComposerModel } from '@/features/agent-v2/agent-composer/form-state'
import { cn } from '@langgenius/dify-ui/cn'
import {
@@ -46,7 +45,6 @@ type AgentOrchestratePanelProps = {
agentSoulConfig?: AgentConfigSnapshotDetailResponse['config_snapshot']
agentName?: string | null
currentModel?: AgentComposerModel
- textGenerationModelList: ModelSelectorProvider[]
isPublishing?: boolean
className?: string
readOnly?: boolean
@@ -71,7 +69,6 @@ export function AgentOrchestratePanel({
agentSoulConfig: _agentSoulConfig,
agentName,
currentModel,
- textGenerationModelList,
isPublishing,
className,
readOnly = false,
@@ -164,11 +161,7 @@ export function AgentOrchestratePanel({
isBuildDraftActive ? buildDraftChangedKeys : EMPTY_BUILD_DRAFT_CHANGED_KEYS
}
>
- <AgentModelField
- currentModel={currentModel}
- textGenerationModelList={textGenerationModelList}
- onSelect={onSelectModel}
- />
+ <AgentModelField currentModel={currentModel} onSelect={onSelectModel} />
<AgentPromptEditor />
<AgentSkills />
<AgentFiles />
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx
index 25cba35390c..9df992fcc25 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/__tests__/field.spec.tsx
@@ -1,52 +1,183 @@
-import type { ComponentProps } from 'react'
-import type { ModelParameterModalProps } from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
-import { fireEvent, render, screen } from '@testing-library/react'
+import type { ProviderWithModelsResponse } from '@dify/contracts/api/console/workspaces/types.gen'
+import type { AgentComposerModel } from '@/features/agent-v2/agent-composer/form-state'
+import { QueryClient, QueryClientProvider } from '@tanstack/react-query'
+import { act, render, screen, waitFor } from '@testing-library/react'
+import userEvent from '@testing-library/user-event'
import { AgentModelField } from '../field'
+const providerSummary = vi.hoisted(() => vi.fn())
+
+const modelList = vi.hoisted(() => vi.fn<() => Promise<{ data: ProviderWithModelsResponse[] }>>())
+
+vi.mock('nuqs', async (importOriginal) => ({
+ ...(await importOriginal<typeof import('nuqs')>()),
+ useQueryState: () => [null, vi.fn()],
+}))
+
+vi.mock('@/service/use-common', () => ({
+ useModelParameterRules: () => ({ data: { data: [] }, isLoading: false }),
+}))
+
vi.mock(
- '@/app/components/header/account-setting/model-provider-page/model-parameter-modal',
+ '@/app/components/header/account-setting/model-provider-page/provider-added-card/use-credential-panel-state',
() => ({
- default: ({ setModel }: Pick<ModelParameterModalProps, 'setModel'>) => (
- <button
- type="button"
- onClick={() =>
- setModel({
- modelId: 'claude-sonnet-4-5',
- provider: 'langgenius/anthropic/anthropic',
- plugin_id: 'langgenius/anthropic',
- })
- }
- >
- Select Anthropic
- </button>
- ),
+ useCredentialPanelState: () => ({ variant: 'api-unavailable', hasCredentials: false }),
}),
)
+vi.mock('@/service/console', () => ({
+ consoleQuery: {
+ workspaces: {
+ current: {
+ models: {
+ modelTypes: {
+ byModelType: {
+ get: {
+ queryOptions: (options: object) => ({
+ queryKey: ['model-list'],
+ queryFn: modelList,
+ ...options,
+ }),
+ },
+ },
+ },
+ },
+ modelProviders: {
+ summary: {
+ get: {
+ queryOptions: (options: object) => ({
+ queryKey: ['providers'],
+ queryFn: providerSummary,
+ ...options,
+ }),
+ },
+ },
+ },
+ },
+ },
+ },
+}))
+
+function renderField(currentModel?: AgentComposerModel) {
+ const queryClient = new QueryClient({
+ defaultOptions: { queries: { retry: false } },
+ })
+ const onSelect = vi.fn()
+ render(
+ <QueryClientProvider client={queryClient}>
+ <AgentModelField currentModel={currentModel} onSelect={onSelect} />
+ </QueryClientProvider>,
+ )
+ return { queryClient, onSelect }
+}
+
describe('AgentModelField', () => {
- it('replaces model-owned fields when selecting a model from another provider', () => {
- const onSelect = vi.fn()
- const currentModel: ComponentProps<typeof AgentModelField>['currentModel'] = {
- provider: 'langgenius/openai/openai',
- model: 'gpt-4.1',
- plugin_id: 'langgenius/openai',
- model_settings: { temperature: 0.7 },
- }
-
- render(
- <AgentModelField
- currentModel={currentModel}
- textGenerationModelList={[]}
- onSelect={onSelect}
- />,
+ beforeEach(() => {
+ vi.clearAllMocks()
+ providerSummary.mockResolvedValue({ data: [] })
+ })
+
+ it('disables model controls until the catalog loads without selecting a model', async () => {
+ let resolve!: (value: { data: ProviderWithModelsResponse[] }) => void
+ modelList.mockImplementation(
+ () =>
+ new Promise((done) => {
+ resolve = done
+ }),
)
+ const { onSelect } = renderField()
+
+ expect(screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' })).toBeDisabled()
+ expect(
+ screen.getByRole('button', { name: 'common.modelProvider.modelSettings' }),
+ ).toBeDisabled()
+ expect(screen.queryByText('common.loading')).not.toBeInTheDocument()
+
+ await act(async () => {
+ resolve({ data: [] })
+ })
- fireEvent.click(screen.getByRole('button', { name: 'Select Anthropic' }))
+ await waitFor(() => {
+ expect(
+ screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' }),
+ ).toBeEnabled()
+ })
+ expect(screen.queryByRole('status')).not.toBeInTheDocument()
+ expect(onSelect).not.toHaveBeenCalled()
+ })
- expect(onSelect).toHaveBeenCalledWith({
- provider: 'langgenius/anthropic/anthropic',
- model: 'claude-sonnet-4-5',
- plugin_id: 'langgenius/anthropic',
+ it('keeps a saved model neutral until both catalog and provider metadata arrive', async () => {
+ let resolveCatalog!: (value: { data: ProviderWithModelsResponse[] }) => void
+ let resolveProviders!: (value: { data: [] }) => void
+ modelList.mockImplementation(
+ () =>
+ new Promise((resolve) => {
+ resolveCatalog = resolve
+ }),
+ )
+ providerSummary.mockImplementation(
+ () =>
+ new Promise((resolve) => {
+ resolveProviders = resolve
+ }),
+ )
+ const { onSelect } = renderField({ provider: 'openai', model: 'gpt-4' })
+ const trigger = screen.getByRole('button', { name: 'gpt-4' })
+ const settings = screen.getByRole('button', { name: 'common.modelProvider.modelSettings' })
+
+ expect(trigger).toBeDisabled()
+ expect(settings).toBeDisabled()
+ expect(screen.queryByText('common.loading')).not.toBeInTheDocument()
+ expect(screen.queryByText(/incompatible|disabled/i)).not.toBeInTheDocument()
+
+ await act(async () => {
+ resolveCatalog({ data: [] })
+ })
+ expect(trigger).toBeDisabled()
+ expect(settings).toBeDisabled()
+ expect(screen.queryByText(/incompatible|disabled/i)).not.toBeInTheDocument()
+
+ await act(async () => {
+ resolveProviders({ data: [] })
+ })
+ await waitFor(() => {
+ expect(trigger).toBeEnabled()
+ })
+ expect(screen.getByText('common.modelProvider.selector.incompatible')).toBeInTheDocument()
+ expect(onSelect).not.toHaveBeenCalled()
+ })
+
+ it('keeps a failed initial load disabled and lets the user retry', async () => {
+ const user = userEvent.setup()
+ modelList.mockRejectedValueOnce(new Error('Unavailable')).mockResolvedValue({ data: [] })
+ renderField()
+
+ expect(await screen.findByRole('alert')).toHaveTextContent('common.api.actionFailed')
+ expect(screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' })).toBeDisabled()
+ await user.click(screen.getByRole('button', { name: 'common.operation.retry' }))
+ await waitFor(() => {
+ expect(
+ screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' }),
+ ).toBeEnabled()
+ })
+ })
+
+ it('keeps the selector available during a background catalog refresh', async () => {
+ modelList.mockResolvedValue({ data: [] })
+ const { queryClient } = renderField()
+ const trigger = screen.getByRole('button', { name: 'plugin.detailPanel.configureModel' })
+ await waitFor(() => {
+ expect(trigger).toBeEnabled()
+ })
+
+ modelList.mockImplementation(() => new Promise(() => {}))
+ act(() => {
+ void queryClient.invalidateQueries({ queryKey: ['model-list'] })
+ })
+ await waitFor(() => {
+ expect(modelList).toHaveBeenCalledTimes(2)
})
+ expect(trigger).toBeEnabled()
+ expect(screen.queryByRole('status')).not.toBeInTheDocument()
})
})
diff --git a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx
index 9d072f1791d..67c4b759109 100644
--- a/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx
+++ b/web/features/agent-v2/agent-detail/configure/components/orchestrate/model-config/field.tsx
@@ -1,27 +1,43 @@
'use client'
import type { FormValue } from '@/app/components/header/account-setting/model-provider-page/declarations'
-import type { ModelSelectorProvider } from '@/app/components/header/account-setting/model-provider-page/model-selector/types'
import type { AgentComposerModel } from '@/features/agent-v2/agent-composer/form-state'
+import { Button } from '@langgenius/dify-ui/button'
import { Field, FieldLabel } from '@langgenius/dify-ui/field'
+import { useQuery } from '@tanstack/react-query'
import { useTranslation } from 'react-i18next'
+import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
import ModelParameterModal from '@/app/components/header/account-setting/model-provider-page/model-parameter-modal'
+import { consoleQuery } from '@/service/console'
import { isAgentCompatibleModel, isAgentSuggestedModel } from '../../../model-compatibility'
import { useAgentOrchestrateReadOnly } from '../read-only-context'
type AgentModelFieldProps = {
currentModel?: AgentComposerModel
- textGenerationModelList: ModelSelectorProvider[]
onSelect: (model: AgentComposerModel) => void
}
-export function AgentModelField({
- currentModel,
- textGenerationModelList,
- onSelect,
-}: AgentModelFieldProps) {
+export function AgentModelField({ currentModel, onSelect }: AgentModelFieldProps) {
const { t } = useTranslation('agentV2')
const readOnly = useAgentOrchestrateReadOnly()
+ const modelListQuery = useQuery(
+ consoleQuery.workspaces.current.models.modelTypes.byModelType.get.queryOptions({
+ input: { params: { model_type: ModelTypeEnum.textGeneration } },
+ select: (response) => response.data,
+ enabled: !readOnly,
+ }),
+ )
+ const providerQuery = useQuery(
+ consoleQuery.workspaces.current.modelProviders.summary.get.queryOptions({
+ enabled: !readOnly && !!currentModel?.provider,
+ }),
+ )
+ const modelListUnavailable = modelListQuery.data === undefined
+ const providerUnavailable = !!currentModel?.provider && providerQuery.data === undefined
+ const modelStatusUnavailable = modelListUnavailable || providerUnavailable
+ const hasLoadError =
+ (modelListUnavailable && modelListQuery.isError) ||
+ (providerUnavailable && providerQuery.isError)
return (
<Field name="model" className="gap-1 pb-4">
@@ -39,7 +55,9 @@ export function AgentModelField({
provider={currentModel?.provider ?? ''}
completionParams={(currentModel?.model_settings ?? {}) as FormValue}
hideDebugWithMultipleModel
- modelList={textGenerationModelList}
+ modelList={modelListQuery.data ?? []}
+ readonly={modelStatusUnavailable}
+ modelListLoading={modelStatusUnavailable}
showModelMeta={false}
modelPredicate={isAgentCompatibleModel}
modelSuggestionPredicate={isAgentSuggestedModel}
@@ -61,6 +79,20 @@ export function AgentModelField({
}}
/>
)}
+ {!readOnly && hasLoadError && (
+ <div role="alert" className="flex items-center gap-2 text-text-warning">
+ <span>{t(($) => $['api.actionFailed'], { ns: 'common' })}</span>
+ <Button
+ size="small"
+ onClick={() => {
+ if (modelListUnavailable) void modelListQuery.refetch()
+ if (providerUnavailable) void providerQuery.refetch()
+ }}
+ >
+ {t(($) => $['operation.retry'], { ns: 'common' })}
+ </Button>
+ </div>
+ )}
</Field>
)
}
diff --git a/web/features/agent-v2/agent-detail/configure/hooks.ts b/web/features/agent-v2/agent-detail/configure/hooks.ts
index 881e728de2e..87ad8564976 100644
--- a/web/features/agent-v2/agent-detail/configure/hooks.ts
+++ b/web/features/agent-v2/agent-detail/configure/hooks.ts
@@ -2,15 +2,9 @@
import type { AgentSoulConfig } from '@dify/contracts/api/console/agent/types.gen'
import { skipToken, useQuery } from '@tanstack/react-query'
-import { useAtom, useAtomValue } from 'jotai'
-import { ModelTypeEnum } from '@/app/components/header/account-setting/model-provider-page/declarations'
-import {
- useDefaultModel,
- useTextGenerationCurrentProviderAndModelAndModelList,
-} from '@/app/components/header/account-setting/model-provider-page/hooks'
+import { useAtomValue } from 'jotai'
import { getAgentACLCapabilities } from '@/features/agent-v2/acl'
import { agentComposerAppFeaturesAtom } from '@/features/agent-v2/agent-composer/store-modules/app-features'
-import { agentComposerModelAtom } from '@/features/agent-v2/agent-composer/store-modules/model'
import { consoleQuery } from '@/service/console'
export function useAgentConfigureData(agentId: string, requestedVersionId: string | null) {
@@ -78,26 +72,6 @@ export function useAgentConfigureData(agentId: string, requestedVersionId: strin
}
}
-export function useAgentConfigureModelOptions() {
- const [model, setModel] = useAtom(agentComposerModelAtom)
- const { data: defaultTextGenerationModel } = useDefaultModel(ModelTypeEnum.textGeneration)
- const defaultModel = defaultTextGenerationModel
- ? {
- provider: defaultTextGenerationModel.provider.provider,
- model: defaultTextGenerationModel.model,
- }
- : undefined
- const currentModel = model ?? defaultModel
- const { textGenerationModelList } =
- useTextGenerationCurrentProviderAndModelAndModelList(currentModel)
-
- return {
- currentModel,
- setConfigureModel: setModel,
- textGenerationModelList,
- }
-}
-
export function useAgentPreviewSoulConfig(agentSoulConfig: AgentSoulConfig | undefined) {
const draftAppFeatures = useAtomValue(agentComposerAppFeaturesAtom)
diff --git a/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts b/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts
index 11706d36f65..43918378887 100644
--- a/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts
+++ b/web/features/agent-v2/agent-detail/configure/use-agent-configure-sync.ts
@@ -1,7 +1,6 @@
'use client'
import type { AgentSoulConfig } from '@dify/contracts/api/console/agent/types.gen'
-import type { DefaultModel } from '@/app/components/header/account-setting/model-provider-page/declarations'
import type { AgentSoulConfigFormState } from '@/features/agent-v2/agent-composer/form-state'
import { mutationOptions, useMutation, useQueryClient } from '@tanstack/react-query'
import { debounce } from 'es-toolkit/compat'
@@ -37,14 +36,12 @@ export function useAgentConfigureSync({
agentId,
agentName,
baseConfig,
- currentModel,
enabled,
publishEnabled,
}: {
agentId: string
agentName?: string | null
baseConfig?: AgentSoulConfig
- currentModel?: DefaultModel
enabled: boolean
publishEnabled: boolean
}) {
@@ -58,7 +55,6 @@ export function useAgentConfigureSync({
const store = useStore()
const setSavedDraft = useSetAtom(agentComposerSavedDraftAtom)
const baseConfigRef = useRef(baseConfig)
- const currentModelRef = useRef(currentModel)
const enabledRef = useRef(enabled)
const publishEnabledRef = useRef(publishEnabled)
const lastAutosavedDraftKeyRef = useRef<string | undefined>(undefined)
@@ -83,20 +79,18 @@ export function useAgentConfigureSync({
useEffect(() => {
baseConfigRef.current = baseConfig
- currentModelRef.current = currentModel
enabledRef.current = enabled
publishEnabledRef.current = publishEnabled
- }, [baseConfig, currentModel, enabled, publishEnabled])
+ }, [baseConfig, enabled, publishEnabled])
- const getAgentSoulDraft = useCallback(
- () =>
- formStateToAgentSoulConfig({
- baseConfig: baseConfigRef.current,
- formState: store.get(agentComposerDraftAtom),
- currentModel: currentModelRef.current,
- }),
- [store],
- )
+ const getAgentSoulDraft = useCallback(() => {
+ const draft = store.get(agentComposerDraftAtom)
+ return formStateToAgentSoulConfig({
+ baseConfig: baseConfigRef.current,
+ formState: draft,
+ currentModel: draft.model,
+ })
+ }, [store])
const { mutateAsync: saveComposerDraft } = useMutation(
consoleQuery.agent.byAgentId.composer.put.mutationOptions({
@@ -409,7 +403,7 @@ export function useAgentConfigureSync({
const configSnapshot = formStateToAgentSoulConfig({
baseConfig: baseConfigRef.current,
formState: draft,
- currentModel: currentModelRef.current,
+ currentModel: draft.model,
})
if (!configSnapshot.model?.model_provider || !configSnapshot.model.model) {
toast.error(tCommon(($) => $['modelProvider.selectModel']))