🐛 generate button in Agent config page returns error: Empty agent ID in creation mode

Phinease · web-flow · commit e02da79cde38 · 2025-11-14T17:04:50.000+08:00
diff --git a/backend/services/prompt_service.py b/backend/services/prompt_service.py
@@ -118,10 +118,15 @@ def generate_and_save_system_prompt_impl(agent_id: int,
                                          tenant_id: str,
                                          language: str):
     # Get description of tool and agent
-    tool_info_list = get_enabled_tool_description_for_generate_prompt(
-        tenant_id=tenant_id, agent_id=agent_id)
-    sub_agent_info_list = get_enabled_sub_agent_description_for_generate_prompt(
-        tenant_id=tenant_id, agent_id=agent_id)
+    # In create mode (agent_id=0), return empty lists
+    if agent_id == 0:
+        tool_info_list = []
+        sub_agent_info_list = []
+    else:
+        tool_info_list = get_enabled_tool_description_for_generate_prompt(
+            tenant_id=tenant_id, agent_id=agent_id)
+        sub_agent_info_list = get_enabled_sub_agent_description_for_generate_prompt(
+            tenant_id=tenant_id, agent_id=agent_id)
 
     # 1. Real-time streaming push
     final_results = {"duty": "", "constraint": "", "few_shots": "", "agent_var_name": "", "agent_display_name": "",
@@ -132,25 +137,29 @@ def generate_and_save_system_prompt_impl(agent_id: int,
         final_results[result_data["type"]] = result_data["content"]
         yield result_data
 
-    # 2. Update agent with the final result
-    logger.info("Updating agent with business_description and prompt segments")
-    agent_info = AgentInfoRequest(
-        agent_id=agent_id,
-        business_description=task_description,
-        duty_prompt=final_results["duty"],
-        constraint_prompt=final_results["constraint"],
-        few_shots_prompt=final_results["few_shots"],
-        name=final_results["agent_var_name"],
-        display_name=final_results["agent_display_name"],
-        description=final_results["agent_description"]
-    )
-    update_agent(
-        agent_id=agent_id,
-        agent_info=agent_info,
-        tenant_id=tenant_id,
-        user_id=user_id
-    )
-    logger.info("Prompt generation and agent update completed successfully")
+    # 2. Update agent with the final result (skip in create mode)
+    if agent_id == 0:
+        logger.info("Skipping agent update in create mode (agent_id=0)")
+    else:
+        logger.info(
+            "Updating agent with business_description and prompt segments")
+        agent_info = AgentInfoRequest(
+            agent_id=agent_id,
+            business_description=task_description,
+            duty_prompt=final_results["duty"],
+            constraint_prompt=final_results["constraint"],
+            few_shots_prompt=final_results["few_shots"],
+            name=final_results["agent_var_name"],
+            display_name=final_results["agent_display_name"],
+            description=final_results["agent_description"]
+        )
+        update_agent(
+            agent_id=agent_id,
+            agent_info=agent_info,
+            tenant_id=tenant_id,
+            user_id=user_id
+        )
+        logger.info("Prompt generation and agent update completed successfully")
 
 
 def generate_system_prompt(sub_agent_info_list, task_description, tool_info_list, tenant_id: str, model_id: int, language: str = LANGUAGE["ZH"]):
diff --git a/frontend/app/[locale]/setup/agents/components/AgentSetupOrchestrator.tsx b/frontend/app/[locale]/setup/agents/components/AgentSetupOrchestrator.tsx
@@ -868,6 +868,11 @@ export default function AgentSetupOrchestrator({
 
       // Ensure tool pool won't show loading state
       setIsLoadingTools(false);
+
+      // Reset unsaved state and baseline when explicitly exiting edit mode
+      baselineRef.current = null;
+      setHasUnsavedChanges(false);
+      onUnsavedChange?.(false);
     }
   };
 
diff --git a/frontend/app/[locale]/setup/agents/config.tsx b/frontend/app/[locale]/setup/agents/config.tsx
@@ -146,8 +146,12 @@ export default forwardRef<AgentConfigHandle, AgentConfigProps>(function AgentCon
     // Clear error when validation passes
     setBusinessLogicError(false);
 
+    // In create mode, agent_id should be 0 (backend will handle this case)
+    // In edit mode, use the current agent id
     const currentAgentId = getCurrentAgentId();
-    if (!currentAgentId) {
+    const agentIdToUse = isCreatingNewAgent ? 0 : currentAgentId || 0;
+
+    if (!isCreatingNewAgent && !currentAgentId) {
       message.error(t("businessLogic.config.error.noAgentId"));
       return;
     }
@@ -160,7 +164,7 @@ export default forwardRef<AgentConfigHandle, AgentConfigProps>(function AgentCon
       // Call backend API to generate agent prompt
       await generatePromptStream(
         {
-          agent_id: Number(currentAgentId),
+          agent_id: agentIdToUse,
           task_description: businessLogic,
           model_id: selectedModel?.id?.toString() || "",
         },
@@ -406,29 +410,35 @@ export default forwardRef<AgentConfigHandle, AgentConfigProps>(function AgentCon
 
   // Memoize event handler to avoid recreating listener
   const handleGetAgentConfigData = useCallback(() => {
-      // Check if there is system prompt content
-      let hasSystemPrompt = false;
+    // Check if there is system prompt content
+    let hasSystemPrompt = false;
 
-      // If any of the segmented prompts has content, consider it as having system prompt
+    // If any of the segmented prompts has content, consider it as having system prompt
     if (dutyContentRef.current && dutyContentRef.current.trim() !== "") {
-        hasSystemPrompt = true;
-    } else if (constraintContentRef.current && constraintContentRef.current.trim() !== "") {
-        hasSystemPrompt = true;
-    } else if (fewShotsContentRef.current && fewShotsContentRef.current.trim() !== "") {
-        hasSystemPrompt = true;
-      }
+      hasSystemPrompt = true;
+    } else if (
+      constraintContentRef.current &&
+      constraintContentRef.current.trim() !== ""
+    ) {
+      hasSystemPrompt = true;
+    } else if (
+      fewShotsContentRef.current &&
+      fewShotsContentRef.current.trim() !== ""
+    ) {
+      hasSystemPrompt = true;
+    }
 
-      // Send the current configuration data to the main page
-      const eventData: AgentConfigDataResponse = {
+    // Send the current configuration data to the main page
+    const eventData: AgentConfigDataResponse = {
       businessLogic: businessLogicRef.current,
-        systemPrompt: hasSystemPrompt ? "has_content" : "",
-      };
+      systemPrompt: hasSystemPrompt ? "has_content" : "",
+    };
 
-      window.dispatchEvent(
-        new CustomEvent("agentConfigDataResponse", {
-          detail: eventData,
-        }) as AgentConfigCustomEvent
-      );
+    window.dispatchEvent(
+      new CustomEvent("agentConfigDataResponse", {
+        detail: eventData,
+      }) as AgentConfigCustomEvent
+    );
   }, []); // Empty deps - handler uses refs for latest values
 
   // Add event listener to respond to the data request from the main page
@@ -462,9 +472,15 @@ export default forwardRef<AgentConfigHandle, AgentConfigProps>(function AgentCon
   };
 
   const getCurrentAgentId = () => {
+    // In edit mode, always use the currently editing agent's id
     if (isEditingAgent && editingAgent) {
       return parseInt(editingAgent.id);
     }
+    // In create mode, the agent has not been persisted yet, so there should be no agent_id
+    if (isCreatingNewAgent) {
+      return undefined;
+    }
+    // Fallback to mainAgentId when not creating and not explicitly editing
     return mainAgentId ? parseInt(mainAgentId) : undefined;
   };
 
diff --git a/test/backend/services/test_prompt_service.py b/test/backend/services/test_prompt_service.py
@@ -161,6 +161,59 @@ def mock_generator(*args, **kwargs):
         self.assertEqual(agent_info.agent_id, 123)
         self.assertEqual(agent_info.business_description, "Test task")
 
+    @patch('backend.services.prompt_service.generate_system_prompt')
+    @patch('backend.services.prompt_service.get_enabled_sub_agent_description_for_generate_prompt')
+    @patch('backend.services.prompt_service.get_enabled_tool_description_for_generate_prompt')
+    @patch('backend.services.prompt_service.update_agent')
+    def test_generate_and_save_system_prompt_impl_create_mode(self, mock_update_agent, mock_get_tool_desc,
+                                                               mock_get_agent_desc, mock_generate_system_prompt):
+        """Test generate_and_save_system_prompt_impl in create mode (agent_id=0)"""
+        # Setup - Mock the generator to return the expected data structure
+        def mock_generator(*args, **kwargs):
+            yield {"type": "duty", "content": "Generated duty prompt", "is_complete": False}
+            yield {"type": "constraint", "content": "Generated constraint prompt", "is_complete": False}
+            yield {"type": "few_shots", "content": "Generated few shots prompt", "is_complete": False}
+            yield {"type": "agent_var_name", "content": "test_agent", "is_complete": True}
+            yield {"type": "agent_display_name", "content": "Test Agent", "is_complete": True}
+            yield {"type": "agent_description", "content": "Test agent description", "is_complete": True}
+            yield {"type": "duty", "content": "Final duty prompt", "is_complete": True}
+            yield {"type": "constraint", "content": "Final constraint prompt", "is_complete": True}
+            yield {"type": "few_shots", "content": "Final few shots prompt", "is_complete": True}
+
+        mock_generate_system_prompt.side_effect = mock_generator
+
+        # Execute - test as a generator with agent_id=0 (create mode)
+        result_gen = generate_and_save_system_prompt_impl(
+            agent_id=0,
+            model_id=self.test_model_id,
+            task_description="Test task",
+            user_id="user123",
+            tenant_id="tenant456",
+            language="zh"
+        )
+        result = list(result_gen)  # Convert generator to list for assertion
+
+        # Assert
+        self.assertGreater(len(result), 0)
+
+        # In create mode, should NOT call get_enabled_tool_description_for_generate_prompt
+        # and get_enabled_sub_agent_description_for_generate_prompt
+        mock_get_tool_desc.assert_not_called()
+        mock_get_agent_desc.assert_not_called()
+
+        # Should call generate_system_prompt with empty lists for tools and sub-agents
+        mock_generate_system_prompt.assert_called_once_with(
+            [],  # Empty sub_agent_info_list
+            "Test task",
+            [],  # Empty tool_info_list
+            "tenant456",
+            self.test_model_id,
+            "zh"
+        )
+
+        # In create mode, should NOT call update_agent
+        mock_update_agent.assert_not_called()
+
     @patch('backend.services.prompt_service.generate_and_save_system_prompt_impl')
     def test_gen_system_prompt_streamable(self, mock_generate_impl):
         """Test gen_system_prompt_streamable function"""
