Skip to content

🐛 Bugfix: exit create mode and select newly created agent after saving #2740

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
WMC001 merged 1 commit into from
Mar 28, 2026
+25 −20
Merged

🐛 Bugfix: exit create mode and select newly created agent after saving #2740

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 25 additions & 20 deletions frontend/hooks/agent/useSaveGuard.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,24 +151,11 @@ export const useSaveGuard = () => {
throw new Error("Failed to get agent ID after save operation");
}

// Batch process tool configurations for both create and update modes
const baselineTools = useAgentConfigStore.getState().baselineAgent?.tools || [];
await batchUpdateToolConfigs(finalAgentId, currentEditedAgent.tools || [], baselineTools);

// Common logic for both creation and update: refresh cache and update store
await queryClient.invalidateQueries({
queryKey: ["agentInfo", finalAgentId]
});
await queryClient.refetchQueries({
queryKey: ["agentInfo", finalAgentId]
});
// Get the updated agent data from the refreshed cache
let updatedAgent = queryClient.getQueryData(["agentInfo", finalAgentId]) as Agent;

// For new agents, the cache might not be populated yet
// Construct a minimal Agent object from the edited data
if (!updatedAgent && finalAgentId) {
updatedAgent = {
// For newly created agents, we need to exit create mode and set the current agent
const isNewlyCreated = !currentAgentId && result.data?.agent_id;
if (isNewlyCreated) {
// Create a minimal agent object for the store
const newAgent: Agent = {
id: String(finalAgentId),
name: currentEditedAgent.name,
display_name: currentEditedAgent.display_name,
Expand All @@ -188,10 +175,28 @@ export const useSaveGuard = () => {
sub_agent_id_list: currentEditedAgent.sub_agent_id_list,
group_ids: currentEditedAgent.group_ids || [],
};
// Exit create mode and select the newly created agent
useAgentConfigStore.getState().setCurrentAgent(newAgent);
}

if (updatedAgent) {
useAgentConfigStore.getState().setCurrentAgent(updatedAgent);
// Batch process tool configurations for both create and update modes
const baselineTools = useAgentConfigStore.getState().baselineAgent?.tools || [];
await batchUpdateToolConfigs(finalAgentId, currentEditedAgent.tools || [], baselineTools);

// Common logic for both creation and update: refresh cache and update store
await queryClient.invalidateQueries({
queryKey: ["agentInfo", finalAgentId]
});
await queryClient.refetchQueries({
queryKey: ["agentInfo", finalAgentId]
});

// For existing agents (update mode), get the updated agent data from the refreshed cache
if (!isNewlyCreated) {
const updatedAgent = queryClient.getQueryData(["agentInfo", finalAgentId]) as Agent;
if (updatedAgent) {
useAgentConfigStore.getState().setCurrentAgent(updatedAgent);
}
}

// Also invalidate the agents list cache to ensure the list reflects any changes
Expand Down
Loading