Merge remote-tracking branch 'origin/main' into ljy/main

Author: ljy65535

CONTRIBUTING.md

@@ -68,7 +68,7 @@ git checkout -b your-branch-name
 ```
 
 ### Step 4: Make Your Changes
-🧙‍♂️ Code like a wizard! Follow our [Development Guide](./DEVELOPMENT.md) for setup instructions and coding standards. Ensure your changes are well-tested and documented.
+🧙‍♂️ Code like a wizard! Follow our [Development Guide](./DEVELOPPER_NOTE.md) for setup instructions and coding standards. Ensure your changes are well-tested and documented.
 
 ### Step 5: Commit Your Changes
 📝 Commit with a clear and concise message following our commit message guidelines:

CONTRIBUTING_CN.md

@@ -69,7 +69,7 @@ git checkout -b 您的分支名
 ```
 
 ### 第四步：进行更改
-🧙‍♂️ 像魔法师一样编码！遵循我们的 [开发指南](./DEVELOPMENT.md) 获取设置说明和编码标准。确保您的更改经过充分测试并有文档记录。
+🧙‍♂️ 像魔法师一样编码！遵循我们的 [开发指南](./DEVELOPPER_NOTE_CN.md) 获取设置说明和编码标准。确保您的更改经过充分测试并有文档记录。
 
 ### 第五步：提交更改
 📝 按照我们的提交消息规范，提交清晰简洁的消息（建议采用英文，让更多人理解你）：

FAQ.md

@@ -11,27 +11,25 @@ This FAQ addresses common questions and issues you might encounter while install
 - **Q: How do I get a Jina API key for embeddings?**
   - A: To use Jina-based embedding model, you'll need to:
     1. Visit [Jina AI's website](https://jina.ai/), no need to sign up
-    3. Navigate to the Embedding section to get your API key
-    4. Add your API key in the app
+    2. Navigate to the Embedding section to get your API key
+    3. Add your API key in the app
 
-### 🐳 Docker & Docker Compose
-- **Q: TODO**
-  - A: TODO
+### ⚙️ MCP Server Configuration
+- **Q: How do I configure the MCP server? Is frontend configuration supported?**
+  - A: Currently, the MCP server does not support frontend configuration. We plan to add frontend configuration in version v1.1.0. To configure the MCP server, please follow the installation and deployment steps in @README.md. After running `cp .env.example .env`, manually edit the `MCP_SERVICE` field in your `.env` file to the desired MCP service address. Save the file, and you will be able to access the corresponding MCP tools. Note: After making changes, you need to rerun deploy.sh to redeploy.
+
+## 🚫 Common Errors & Operations
 
 ### 🌐 Port Conflicts
 - **Q: Port 3000 is already in use. How can I change it?**
   - A: You can modify the port in the Docker Compose configuration file.
 
-## 🔍 Troubleshooting
-
-### 🚫 Common Errors
-- **Q: The setup wizard isn't loading at http://localhost:3000**
-  - A: TODO
-
 ### 📦 Container Issues
 - **Q: How do I check container logs?**
   - A: Use `docker logs <container_name>` to view logs for specific containers.
 
+## 🔍 Troubleshooting
+
 ### 📧 Email Tools Configuration
 - **Q: How can I enable and configure email tools?**
   - A: Our team has pre-implemented email tools based on IMAP and SMTP. To enable them:
@@ -45,4 +43,4 @@ This FAQ addresses common questions and issues you might encounter while install
 If your question isn't answered here:
 - Join our [Discord community](https://discord.gg/tb5H3S3wyv) for real-time support
 - Check our [GitHub Issues](https://github.com/ModelEngine-Group/nexent/issues) for similar problems
-- Refer to our [Contribution Guide](../CONTRIBUTING.md) for more detailed information
+- Refer to our [Contribution Guide](CONTRIBUTING.md) for more detailed information

FAQ_CN.md

@@ -14,35 +14,23 @@
     3. 进入 Embedding 部分页面获取您的 API 密钥
     4. 将 API 密钥添加到页面中
 
-### 🐳 Docker 与 Docker Compose
-- **Q: TODO**
-  - A: TODO
+### ⚙️ MCP 服务器配置
+- **Q: 当前 MCP 服务器如何配置？支持前端配置吗？**
+  - A: 当前 MCP 服务器暂不支持前端配置。我们计划在 v1.1.0 版本上线前端配置功能。如需配置 MCP 服务器，请参考 @README.md 的安装部署流程，在执行 `cp .env.example .env` 后，手动编辑 `.env` 文件中的 `MCP_SERVICE` 字段，将其设置为需要使用的 MCP 服务地址，保存后即可访问对应的 MCP 工具。注意，修改后需重新运行 deploy.sh 进行部署。
+
+## 🚫 常见错误与运维方式
 
 ### 🌐 端口冲突
 - **Q: 端口 3000 已被占用，如何修改？**
   - A: 可以在 Docker Compose 配置文件中修改端口。
 
-## 🔍 故障排除
-
-### 🚫 常见错误
-- **Q: 设置向导无法在 http://localhost:3000 加载**
-  - A: TODO
-
 ### 📦 容器问题
 - **Q: 如何查看容器日志？**
   - A: 使用 `docker logs <容器名称>` 命令查看特定容器的日志。
 
-### 📧 邮件工具配置
-- **Q: 如何启用和配置邮件工具？**
-  - A: 我们团队已经预制实现了基于 IMAP 和 SMTP 的邮件工具。要启用它们：
-    1. 在 `.env` 文件中配置邮件参数
-    2. 在 `agent_utils.py` 中取消邮件工具相关的注释
-    3. 切换到支持邮件的系统提示词 `code_agent_with_email.yaml`
-    4. 重启 MCP 服务使更改生效
-
 ## ❓ 需要更多帮助？
 
 如果这里没有找到您的问题答案：
 - 加入我们的 [Discord 社区](https://discord.gg/tb5H3S3wyv) 获取实时支持
 - 查看我们的 [GitHub Issues](https://github.com/ModelEngine-Group/nexent/issues) 寻找类似问题
-- 参考我们的[贡献指南](../CONTRIBUTING_CN.md)获取更详细的信息 
+- 参考我们的[贡献指南](CONTRIBUTING_CN.md)获取更详细的信息 

frontend/app/setup/agentSetup/AgentConfig.tsx

@@ -43,6 +43,8 @@ export default function AgentConfig() {
   const [newAgentDescription, setNewAgentDescription] = useState("")
   const [newAgentProvideSummary, setNewAgentProvideSummary] = useState(true)
   const [isNewAgentInfoValid, setIsNewAgentInfoValid] = useState(false)
+  const [isEditingAgent, setIsEditingAgent] = useState(false)
+  const [editingAgent, setEditingAgent] = useState<any>(null)
 
   // load tools when page is loaded
   useEffect(() => {
@@ -167,6 +169,17 @@ export default function AgentConfig() {
     }
   }, [isCreatingNewAgent]);
 
+  const handleEditingStateChange = (isEditing: boolean, agent: any) => {
+    setIsEditingAgent(isEditing)
+    setEditingAgent(agent)
+  }
+
+  const getCurrentAgentId = () => {
+    if (isEditingAgent && editingAgent) {
+      return parseInt(editingAgent.id)
+    }
+    return mainAgentId ? parseInt(mainAgentId) : undefined
+  }
 
   return (
     <div className="w-full h-full mx-auto px-4" style={{ maxWidth: "1920px"}}>
@@ -238,6 +251,7 @@ export default function AgentConfig() {
                   setNewAgentProvideSummary={setNewAgentProvideSummary}
                   isNewAgentInfoValid={isNewAgentInfoValid}
                   setIsNewAgentInfoValid={setIsNewAgentInfoValid}
+                  onEditingStateChange={handleEditingStateChange}
                 />
               </div>
             </div>
@@ -258,7 +272,7 @@ export default function AgentConfig() {
                     setIsDebugDrawerOpen(true);
                     setCurrentGuideStep(isCreatingNewAgent ? 5 : 5);
                   }}
-                  agentId={mainAgentId ? parseInt(mainAgentId) : undefined}
+                  agentId={getCurrentAgentId()}
                 />
               </div>
             </div>
@@ -287,7 +301,7 @@ export default function AgentConfig() {
             setTestQuestion={setTestQuestion}
             testAnswer={testAnswer}
             setTestAnswer={setTestAnswer}
-            agentId={mainAgentId ? Number(mainAgentId) : undefined}
+            agentId={getCurrentAgentId()}
           />
         </div>
       </Drawer>