From 438fe730551cc12aa4568f47c337209ef7407916 Mon Sep 17 00:00:00 2001
From: qianshengjia <840646206@qq.com>
Date: Mon, 24 Aug 2026 10:48:16 +0800
Subject: [PATCH 1/3] copy agent skip duplicate skills

---
 backend/apps/agent_repository_app.py          |  5 ++
 backend/services/agent_repository_service.py  | 17 +++-
 .../components/AgentRepositoryCopyDialog.tsx  | 87 +++++++++++++++----
 .../useAgentRepositoryListings.ts             |  7 +-
 frontend/public/locales/en/common.json        |  3 +
 frontend/public/locales/zh/common.json        |  3 +
 frontend/services/agentRepositoryService.ts   | 17 ++--
 7 files changed, 110 insertions(+), 29 deletions(-)

diff --git a/backend/apps/agent_repository_app.py b/backend/apps/agent_repository_app.py
index 37a023b8d1..3bbf5c83d1 100644
--- a/backend/apps/agent_repository_app.py
+++ b/backend/apps/agent_repository_app.py
@@ -246,6 +246,10 @@ async def check_repository_import_precheck_api(
 @agent_repository_router.post("/{agent_repository_id}/import")
 async def import_agent_from_repository_api(
     agent_repository_id: int,
+    skip_duplicates: bool = Query(
+        False,
+        description="If True, skip duplicate skills and proceed with the remaining skills",
+    ),
     authorization: Optional[str] = Header(None),
 ):
     """Import an agent tree from a marketplace repository listing into the current tenant."""
@@ -255,6 +259,7 @@ async def import_agent_from_repository_api(
             agent_repository_id=agent_repository_id,
             tenant_id=tenant_id,
             authorization=authorization,
+            skip_duplicates=skip_duplicates,
         )
         return JSONResponse(status_code=HTTPStatus.OK, content={})
     except UnauthorizedError as e:
diff --git a/backend/services/agent_repository_service.py b/backend/services/agent_repository_service.py
index 9369075205..03f86c5af4 100644
--- a/backend/services/agent_repository_service.py
+++ b/backend/services/agent_repository_service.py
@@ -12,7 +12,7 @@
     VALID_OWNERSHIP_FILTERS,
     VALID_REPOSITORY_STATUSES,
 )
-from consts.exceptions import UnauthorizedError
+from consts.exceptions import SkillDuplicateError, UnauthorizedError
 from consts.model import AgentRepositorySnapshot
 from consts.notification import EVENT_TYPE_REPOSITORY_REVIEW_PENDING, RESOURCE_TYPE_AGENT_REPOSITORY
 from database.agent_db import search_agent_info_by_agent_id
@@ -1045,8 +1045,13 @@ async def import_agent_from_repository_impl(
     agent_repository_id: int,
     tenant_id: str,
     authorization: str,
+    skip_duplicates: bool = False,
 ) -> Dict[int, int]:
-    """Import an agent tree from a marketplace repository listing into the current tenant."""
+    """Import an agent tree from a marketplace repository listing into the current tenant.
+
+    When skip_duplicates=True, duplicate skills are silently dropped. If all skills are
+    duplicates, the agent is imported without any skills (same as AgentImportWizard behavior).
+    """
     record = get_agent_repository_by_id(
         agent_repository_id,
         tenant_id,
@@ -1059,13 +1064,19 @@ async def import_agent_from_repository_impl(
         raise ValueError("Repository listing has no agent snapshot")
 
     snapshot = AgentRepositorySnapshot.model_validate(agent_info_json)
-    if snapshot.skills:
+
+    if snapshot.skills and not skip_duplicates:
         result = await import_agent_with_skills_impl(
             snapshot,
             snapshot.skills,
             authorization,
         )
     else:
+        if snapshot.skills and skip_duplicates:
+            logger.info(
+                "Skipping %d skills on repository import (id=%s) due to conflicts",
+                len(snapshot.skills), agent_repository_id,
+            )
         result = await import_agent_impl(snapshot, authorization)
 
     affected = increment_agent_repository_downloads(agent_repository_id)
diff --git a/frontend/app/[locale]/agent-space/components/AgentRepositoryCopyDialog.tsx b/frontend/app/[locale]/agent-space/components/AgentRepositoryCopyDialog.tsx
index 47814c14d7..8363beacaf 100644
--- a/frontend/app/[locale]/agent-space/components/AgentRepositoryCopyDialog.tsx
+++ b/frontend/app/[locale]/agent-space/components/AgentRepositoryCopyDialog.tsx
@@ -13,6 +13,7 @@ import {
   ExternalLink,
   Plug,
   RefreshCw,
+  SkipForward,
   Sparkles,
   Wrench,
   X,
@@ -105,6 +106,14 @@ export function AgentRepositoryCopyDialog({
     [precheck]
   );
 
+  const skillConflictItems = useMemo(
+    () =>
+      abnormalItems.filter((item) => item.reason_code === "skill_duplicate"),
+    [abnormalItems]
+  );
+  const hasSkillConflicts = skillConflictItems.length > 0;
+  const skillConflictNames = skillConflictItems.map((item) => item.name);
+
   const percent = precheck?.percent ?? 0;
   const hasAbnormal = precheck?.has_abnormal ?? false;
 
@@ -116,14 +125,21 @@ export function AgentRepositoryCopyDialog({
     router.push(`/${locale}${path}`);
   };
 
-  const handleCopy = async () => {
+  const handleCopy = async (skipDuplicates = false) => {
     if (!agentRepositoryId) {
       return;
     }
     try {
-      await importMutation.mutateAsync(agentRepositoryId);
+      await importMutation.mutateAsync({
+        agentRepositoryId,
+        skipDuplicates,
+      });
       message.success(
-        t("agentRepository.copy.success", { name: listingTitle })
+        skipDuplicates
+          ? t("agentRepository.copy.successWithoutSkills", {
+              name: listingTitle,
+            })
+          : t("agentRepository.copy.success", { name: listingTitle })
       );
       onOpenChange(false);
       onSuccess?.();
@@ -141,7 +157,7 @@ export function AgentRepositoryCopyDialog({
         detail?.type === "skill_duplicate" &&
         Array.isArray(detail.duplicate_skills)
       ) {
-        message.error(
+        message.warning(
           t("agentRepository.copy.skillDuplicate", {
             names: detail.duplicate_skills.join(", "),
           })
@@ -169,17 +185,49 @@ export function AgentRepositoryCopyDialog({
       width={520}
       destroyOnHidden
       footer={
-        <div className="flex justify-end gap-2">
-          <Button onClick={handleClose}>{t("common.cancel")}</Button>
-          <Button
-            type="primary"
-            icon={<Copy className="size-4" />}
-            loading={importMutation.isPending}
-            disabled={!precheck || isLoading || isError}
-            onClick={handleCopy}
-          >
-            {t("agentRepository.card.copy")}
-          </Button>
+        <div className="flex flex-col gap-2">
+          {hasSkillConflicts ? (
+            <div className="flex items-center justify-between rounded-lg bg-amber-50 px-3 py-2 text-xs text-amber-700 dark:bg-amber-500/10 dark:text-amber-300">
+              <div className="flex items-center gap-2">
+                <AlertCircle className="size-4 shrink-0" />
+                <span>
+                  {t("agentRepository.copy.skillConflict", {
+                    count: skillConflictItems.length,
+                  })}
+                  <span className="ml-1 font-medium">
+                    {skillConflictNames.join(", ")}
+                  </span>
+                </span>
+              </div>
+              <div className="flex gap-2">
+                <Button
+                  size="small"
+                  icon={<SkipForward className="size-3.5" />}
+                  loading={importMutation.isPending}
+                  onClick={() => handleCopy(true)}
+                >
+                  {t("agentRepository.copy.skipAndCopy")}
+                </Button>
+              </div>
+            </div>
+          ) : null}
+          <div className="flex justify-end gap-2">
+            <Button onClick={handleClose}>{t("common.cancel")}</Button>
+            <Button
+              type="primary"
+              icon={<Copy className="size-4" />}
+              loading={importMutation.isPending}
+              disabled={
+                !precheck ||
+                isLoading ||
+                isError ||
+                hasSkillConflicts
+              }
+              onClick={() => handleCopy(false)}
+            >
+              {t("agentRepository.card.copy")}
+            </Button>
+          </div>
         </div>
       }
       styles={{
@@ -354,6 +402,8 @@ function RequirementTypeGroup({
   const abnormal = status === "abnormal";
   const typeLabel = getRepositoryRequirementTypeLabel(type, t);
   const activatePath = getRepositoryRequirementActivatePath(type);
+  const isSkillDuplicate =
+    items.length > 0 && items[0]?.reason_code === "skill_duplicate";
 
   return (
     <div className="rounded-lg border border-slate-200 p-3 dark:border-slate-700">
@@ -363,7 +413,12 @@ function RequirementTypeGroup({
           {typeLabel}
         </div>
         {abnormal ? (
-          activatePath ? (
+          isSkillDuplicate ? (
+            <span className="flex items-center gap-1 text-xs text-amber-600">
+              <AlertCircle className="size-3.5" />
+              {getRepositoryRequirementReasonLabel("skill_duplicate", t)}
+            </span>
+          ) : activatePath ? (
             <button
               type="button"
               onClick={onActivate}
diff --git a/frontend/hooks/agentRepository/useAgentRepositoryListings.ts b/frontend/hooks/agentRepository/useAgentRepositoryListings.ts
index 6d827aa098..a0fa84a4d5 100644
--- a/frontend/hooks/agentRepository/useAgentRepositoryListings.ts
+++ b/frontend/hooks/agentRepository/useAgentRepositoryListings.ts
@@ -140,8 +140,11 @@ export function useImportAgentFromRepository() {
   const queryClient = useQueryClient();
 
   return useMutation({
-    mutationFn: (agentRepositoryId: number) =>
-      agentRepositoryService.importAgentFromRepository(agentRepositoryId),
+    mutationFn: (params: { agentRepositoryId: number; skipDuplicates?: boolean }) =>
+      agentRepositoryService.importAgentFromRepository(
+        params.agentRepositoryId,
+        params.skipDuplicates
+      ),
     onSuccess: async () => {
       await Promise.all([
         invalidateAgentRepositoryCaches(queryClient),
diff --git a/frontend/public/locales/en/common.json b/frontend/public/locales/en/common.json
index fba37a444a..3fbeff4147 100644
--- a/frontend/public/locales/en/common.json
+++ b/frontend/public/locales/en/common.json
@@ -2120,6 +2120,9 @@
   "agentRepository.copy.success": "Copied \"{{name}}\". You can edit it under Mine.",
   "agentRepository.copy.failed": "Copy failed. Please try again.",
   "agentRepository.copy.skillDuplicate": "These skills already exist and cannot be imported: {{names}}",
+  "agentRepository.copy.skillConflict": "{{count}} skill name conflict(s) detected:",
+  "agentRepository.copy.skipAndCopy": "Skip conflicts & copy",
+  "agentRepository.copy.successWithoutSkills": "Copied \"{{name}}\" (conflicting skills skipped). You can edit it in \"My Agents\".",
   "agentRepository.copy.type.model": "Model",
   "agentRepository.copy.type.knowledgeBase": "Knowledge base",
   "agentRepository.copy.type.mcp": "MCP service",
diff --git a/frontend/public/locales/zh/common.json b/frontend/public/locales/zh/common.json
index 9f964a542b..9a3925a404 100644
--- a/frontend/public/locales/zh/common.json
+++ b/frontend/public/locales/zh/common.json
@@ -2085,6 +2085,9 @@
   "agentRepository.copy.success": "已复制「{{name}}」，可在「我的」中编辑",
   "agentRepository.copy.failed": "复制失败，请稍后重试",
   "agentRepository.copy.skillDuplicate": "以下 Skill 已存在，无法复制：{{names}}",
+  "agentRepository.copy.skillConflict": "检测到 {{count}} 个 Skill 名称冲突：",
+  "agentRepository.copy.skipAndCopy": "跳过冲突并复制",
+  "agentRepository.copy.successWithoutSkills": "已复制「{{name}}」（跳过冲突的 Skill），可在「我的」中编辑",
   "agentRepository.copy.type.model": "模型",
   "agentRepository.copy.type.knowledgeBase": "知识库",
   "agentRepository.copy.type.mcp": "MCP 服务",
diff --git a/frontend/services/agentRepositoryService.ts b/frontend/services/agentRepositoryService.ts
index 0194e4954e..48bef45643 100644
--- a/frontend/services/agentRepositoryService.ts
+++ b/frontend/services/agentRepositoryService.ts
@@ -180,16 +180,17 @@ export async function fetchRepositoryImportPrecheck(
 }
 
 export async function importAgentFromRepository(
-  agentRepositoryId: number
+  agentRepositoryId: number,
+  skipDuplicates?: boolean
 ): Promise<void> {
   try {
-    const response = await fetch(
-      API_ENDPOINTS.agentRepository.import(agentRepositoryId),
-      {
-        method: "POST",
-        headers: getAuthHeaders(),
-      }
-    );
+    const url = skipDuplicates
+      ? `${API_ENDPOINTS.agentRepository.import(agentRepositoryId)}?skip_duplicates=true`
+      : API_ENDPOINTS.agentRepository.import(agentRepositoryId);
+    const response = await fetch(url, {
+      method: "POST",
+      headers: getAuthHeaders(),
+    });
 
     if (!response.ok) {
       const errorData = await response.json().catch(() => ({}));

From c7bc89536b44b6a46063654b27dce6238053638a Mon Sep 17 00:00:00 2001
From: qianshengjia <840646206@qq.com>
Date: Mon, 24 Aug 2026 11:20:10 +0800
Subject: [PATCH 2/3] unit test

---
 test/backend/app/test_agent_repository_app.py | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/test/backend/app/test_agent_repository_app.py b/test/backend/app/test_agent_repository_app.py
index 80fed1e56f..d9ed837ea0 100644
--- a/test/backend/app/test_agent_repository_app.py
+++ b/test/backend/app/test_agent_repository_app.py
@@ -722,6 +722,37 @@ def test_import_agent_from_repository_api_passes_tenant_id(
         agent_repository_id=42,
         tenant_id="test_tenant_id",
         authorization=mock_auth_header["Authorization"],
+        skip_duplicates=False,
+    )
+
+
+def test_import_agent_from_repository_api_skip_duplicates(
+    mocker,
+    mock_auth_header,
+):
+    """Test import API forwards skip_duplicates query param to service."""
+    mock_get_user_id = mocker.patch(
+        "apps.agent_repository_app.get_current_user_id"
+    )
+    mock_import = mocker.patch(
+        "apps.agent_repository_app.import_agent_from_repository_impl",
+        new_callable=AsyncMock,
+    )
+
+    mock_get_user_id.return_value = ("test_user_id", "test_tenant_id")
+    mock_import.return_value = {}
+
+    response = client.post(
+        "/repository/agent/42/import?skip_duplicates=true",
+        headers=mock_auth_header,
+    )
+
+    assert response.status_code == 200
+    mock_import.assert_awaited_once_with(
+        agent_repository_id=42,
+        tenant_id="test_tenant_id",
+        authorization=mock_auth_header["Authorization"],
+        skip_duplicates=True,
     )
 
 

From 8bb985ead09cae0ef1fb487a9b82df7e3ea4fb67 Mon Sep 17 00:00:00 2001
From: qianshengjia <840646206@qq.com>
Date: Mon, 24 Aug 2026 12:50:12 +0800
Subject: [PATCH 3/3] unit test

---
 .../services/test_agent_repository_service.py | 122 ++++++++++++++++++
 1 file changed, 122 insertions(+)

diff --git a/test/backend/services/test_agent_repository_service.py b/test/backend/services/test_agent_repository_service.py
index c669577b61..308195d5f3 100644
--- a/test/backend/services/test_agent_repository_service.py
+++ b/test/backend/services/test_agent_repository_service.py
@@ -2100,3 +2100,125 @@ async def test_import_agent_from_repository_skips_increment_on_import_failure():
             )
 
     mock_increment.assert_not_called()
+
+
+@pytest.mark.asyncio
+async def test_import_agent_from_repository_skip_duplicates_with_skills():
+    record = {
+        **_repository_record(agent_repository_id=42, agent_id=10, status="shared"),
+        "agent_info_json": {
+            "agent_id": 10,
+            "agent_info": {"10": {"name": "agent_one"}},
+            "mcp_info": [],
+            "skills": [
+                {"skill_name": "duplicate_skill", "skill_zip_base64": "ZmFrZQ=="}
+            ],
+        },
+    }
+
+    with patch.object(
+        ars,
+        "get_agent_repository_by_id",
+        return_value=record,
+    ), patch.object(
+        ars,
+        "import_agent_with_skills_impl",
+        new_callable=AsyncMock,
+    ) as mock_with_skills, patch.object(
+        ars,
+        "import_agent_impl",
+        new_callable=AsyncMock,
+        return_value={1: 100},
+    ) as mock_import, patch.object(
+        ars,
+        "increment_agent_repository_downloads",
+        return_value=1,
+    ):
+        result = await ars.import_agent_from_repository_impl(
+            agent_repository_id=42,
+            tenant_id="tenant_a",
+            authorization="Bearer token",
+            skip_duplicates=True,
+        )
+
+    mock_with_skills.assert_not_called()
+    mock_import.assert_called_once()
+    assert result == {1: 100}
+
+
+@pytest.mark.asyncio
+async def test_import_agent_from_repository_with_skills_no_skip():
+    record = {
+        **_repository_record(agent_repository_id=42, agent_id=10, status="shared"),
+        "agent_info_json": {
+            "agent_id": 10,
+            "agent_info": {"10": {"name": "agent_one"}},
+            "mcp_info": [],
+            "skills": [
+                {"skill_name": "skill_a", "skill_zip_base64": "ZmFrZQ=="}
+            ],
+        },
+    }
+
+    with patch.object(
+        ars,
+        "get_agent_repository_by_id",
+        return_value=record,
+    ), patch.object(
+        ars,
+        "import_agent_with_skills_impl",
+        new_callable=AsyncMock,
+        return_value={1: 100},
+    ) as mock_with_skills, patch.object(
+        ars,
+        "import_agent_impl",
+        new_callable=AsyncMock,
+    ) as mock_import, patch.object(
+        ars,
+        "increment_agent_repository_downloads",
+        return_value=1,
+    ):
+        result = await ars.import_agent_from_repository_impl(
+            agent_repository_id=42,
+            tenant_id="tenant_a",
+            authorization="Bearer token",
+        )
+
+    mock_with_skills.assert_called_once()
+    mock_import.assert_not_called()
+    assert result == {1: 100}
+
+
+@pytest.mark.asyncio
+async def test_import_agent_from_repository_increment_downloads_zero():
+    record = {
+        **_repository_record(agent_repository_id=42, agent_id=10, status="shared"),
+        "agent_info_json": {
+            "agent_id": 10,
+            "agent_info": {"10": {"name": "agent_one"}},
+            "mcp_info": [],
+        },
+    }
+
+    with patch.object(
+        ars,
+        "get_agent_repository_by_id",
+        return_value=record,
+    ), patch.object(
+        ars,
+        "import_agent_impl",
+        new_callable=AsyncMock,
+        return_value={1: 100},
+    ), patch.object(
+        ars,
+        "increment_agent_repository_downloads",
+        return_value=0,
+    ) as mock_increment:
+        result = await ars.import_agent_from_repository_impl(
+            agent_repository_id=42,
+            tenant_id="tenant_a",
+            authorization="Bearer token",
+        )
+
+    mock_increment.assert_called_once_with(42)
+    assert result == {1: 100}