♻️ Refactor: Optimize agent page layout & refactor agent generate page

backend/apps/agent_app.py

@@ -85,12 +85,13 @@ async def search_agent_info_api(
     """
     Search agent info by agent_id and version_no
     version_no defaults to 0 (current/draft version)
+    Returns permission field indicating whether the user can edit this agent.
     """
     try:
-        _, auth_tenant_id = get_current_user_id(authorization)
+        user_id, auth_tenant_id = get_current_user_id(authorization)
         # Use explicit tenant_id if provided, otherwise fall back to auth tenant_id
         effective_tenant_id = tenant_id or auth_tenant_id
-        return await get_agent_info_impl(agent_id, effective_tenant_id, version_no)
+        return await get_agent_info_impl(agent_id, effective_tenant_id, version_no, user_id)
     except Exception as e:
         logger.error(f"Agent search info error: {str(e)}")
         raise HTTPException(

backend/services/agent_service.py

@@ -67,10 +67,11 @@
     search_tools_for_sub_agent
 )
 from database import skill_db
+from services.skill_service import SkillService
 from database.agent_version_db import query_version_list
 from database.group_db import query_group_ids_by_user
 from database.user_tenant_db import get_user_tenant_by_user_id
-from database.a2a_agent_db import get_server_agent_ids
+from database.a2a_agent_db import get_server_agent_ids, query_external_sub_agents
 from services.prompt_template_service import (
     SYSTEM_PROMPT_TEMPLATE_ID,
     SYSTEM_PROMPT_TEMPLATE_NAME,
@@ -753,13 +754,31 @@
         return create_agent(agent_info={"enabled": False}, tenant_id=tenant_id, user_id=user_id)["agent_id"]
 
 
-async def get_agent_info_impl(agent_id: int, tenant_id: str, version_no: int = 0):
+async def get_agent_info_impl(agent_id: int, tenant_id: str, version_no: int = 0, user_id: Optional[str] = None):
     try:
         agent_info = search_agent_info_by_agent_id(agent_id, tenant_id, version_no)
     except Exception as e:
         logger.error(f"Failed to get agent info: {str(e)}")
         raise ValueError(f"Failed to get agent info: {str(e)}")
 
+    # Calculate permission if user_id is provided
+    if user_id is not None:
+        try:
+            user_tenant_record = get_user_tenant_by_user_id(user_id) or {}
+            user_role = str(user_tenant_record.get("user_role") or "").upper()
+            can_edit_all = user_role in CAN_EDIT_ALL_USER_ROLES
+
+            # Permission logic (same as agent list):
+            # - If creator or can_edit_all: PERMISSION_EDIT
+            # - Otherwise: use ingroup_permission, default to PERMISSION_READ if None
+            if can_edit_all or str(agent_info.get("created_by")) == str(user_id):
+                agent_info["permission"] = PERMISSION_EDIT
+            else:
+                ingroup_permission = agent_info.get("ingroup_permission")
+                agent_info["permission"] = ingroup_permission if ingroup_permission is not None else PERMISSION_READ
+        except Exception as e:
+            logger.warning(f"Failed to calculate agent permission: {str(e)}")
+
     try:
         tool_info = search_tools_for_sub_agent(
             agent_id=agent_id, tenant_id=tenant_id)
@@ -776,6 +795,28 @@
         logger.error(f"Failed to get sub agent id list: {str(e)}")
         agent_info["sub_agent_id_list"] = []
 
+    try:
+        skill_service = SkillService()
+        instances = skill_service.list_skill_instances(
+            agent_id=agent_id,
+            tenant_id=tenant_id,
+            version_no=version_no
+        )
+        agent_info["skills"] = instances
+    except Exception as e:
+        logger.exception(f"Failed to get agent skills: {str(e)}")
+        agent_info["skills"] = []
+
+    try:
+        external_agents = query_external_sub_agents(
+            local_agent_id=agent_id, tenant_id=tenant_id, version_no=version_no)
+        agent_info["external_sub_agent_id_list"] = [
+            ea["external_agent_id"] for ea in external_agents
+        ]
+    except Exception as e:
+        logger.error(f"Failed to get external sub agents: {str(e)}")
+        agent_info["external_sub_agent_id_list"] = []
+
     if agent_info["model_id"] is not None:
         model_info = get_model_by_model_id(agent_info["model_id"])
         agent_info["model_name"] = model_info.get("display_name", None) if model_info is not None else None

backend/services/config_sync_service.py

@@ -182,6 +182,7 @@ def build_models_config(tenant_id: str) -> dict:
 def build_model_config(model_config: dict) -> dict:
     if not model_config:
         return {
+            "id": None,
             "name": "",
             "displayName": "",
             "apiConfig": {
@@ -191,6 +192,7 @@ def build_model_config(model_config: dict) -> dict:
         }
 
     config = {
+        "id": model_config.get("model_id"),
         "name": get_model_name_from_config(model_config) if model_config else "",
         "displayName": model_config.get("display_name", ""),
         "apiConfig": {

backend/services/prompt_service.py

@@ -511,7 +511,7 @@ def run_and_flag(tag, sys_prompt):
 
     # Base sections always generated
     prompt_configs = [
-        ("duty", prompt_for_generate["DUTY_SYSTEM_PROMPT"]),
+        ("duty", prompt_for_generate["duty_system_prompt"]),
         ("agent_var_name",
          prompt_for_generate["agent_variable_name_system_prompt"]),
         ("agent_display_name",
@@ -523,8 +523,8 @@ def run_and_flag(tag, sys_prompt):
     # Constraint and few_shots sections are only generated when tools or sub-agents are selected
     if has_selected_resources:
         prompt_configs.extend([
-            ("constraint", prompt_for_generate["CONSTRAINT_SYSTEM_PROMPT"]),
-            ("few_shots", prompt_for_generate["FEW_SHOTS_SYSTEM_PROMPT"]),
+            ("constraint", prompt_for_generate["constraint_system_prompt"]),
+            ("few_shots", prompt_for_generate["few_shots_system_prompt"]),
         ])
     else:
         logger.info("Skipping constraint and few_shots generation: no tools or sub-agents selected")

frontend/app/[locale]/agents/AgentVersionCard.tsx

@@ -254,11 +254,7 @@ export function VersionCardItem({
         if (store.currentAgentId === agentId) {
           const agentResult = await searchAgentInfo(agentId);
           if (agentResult.success && agentResult.data) {
-            const permissionFromList = currentAgent?.permission ?? undefined;
-            store.setCurrentAgent({
-              ...agentResult.data,
-              permission: permissionFromList,
-            });
+            store.setCurrentAgent(agentResult.data);
             store.triggerForceRefresh();
           }
         }