fix(sync): dedupe ID-seeded skill exports by effective slug

Author: daryllimyt

tests/unit/test_workspace_sync_acceptance_contract.py

@@ -71,6 +71,7 @@
     TABLE_RESOURCE_ADAPTER,
     WORKSPACE_RESOURCE_ADAPTERS,
 )
+from tracecat.workspace_sync.adapters.base import ResourceDependencyRefs
 from tracecat.workspace_sync.enums import SyncResourceType, VcsProvider
 from tracecat.workspace_sync.importer import WorkspaceResourceImportService
 from tracecat.workspace_sync.resources import workflow_references
@@ -1039,6 +1040,45 @@ async def test_skill_projection_rejects_ambiguous_legacy_slugs(
     }
 
 
+@pytest.mark.anyio
+async def test_id_seeded_skill_projection_deduplicates_effective_slugs(
+    session: AsyncSession,
+    svc_role: Role,
+) -> None:
+    """ID-seeded partial export deduplicates expand-window effective slugs."""
+    workspace_id = svc_role.workspace_id
+    assert workspace_id is not None
+    exact_owner = Skill(
+        workspace_id=workspace_id,
+        slug="foo",
+        name="Exact owner",
+        description="Canonical description",
+    )
+    legacy = Skill(
+        workspace_id=workspace_id,
+        slug=None,
+        name="foo",
+        description="Legacy description",
+    )
+    session.add_all([exact_owner, legacy])
+    await session.flush()
+
+    projection = await SKILL_RESOURCE_ADAPTER.project_dependency_refs(
+        WorkspaceSyncService(session=session, role=svc_role),
+        ResourceDependencyRefs(local_ids={exact_owner.id, legacy.id}),
+    )
+
+    matching_specs = [
+        spec
+        for spec in projection.specs.values()
+        if isinstance(spec, SkillResourceSpec) and spec.slug == "foo"
+    ]
+    assert len(matching_specs) == 1
+    assert matching_specs[0].name == "Exact owner"
+    assert matching_specs[0].description == "Canonical description"
+    assert [resource.local_id for resource in projection.resources] == [exact_owner.id]
+
+
 async def _add_preset_version_skill_binding(
     session: AsyncSession,
     *,

tracecat/workspace_sync/adapters/skill.py

@@ -359,11 +359,10 @@ async def project_dependency_refs(
         else:
             stmt = stmt.where(effective_slug.in_(slugs))
         skills = list((await workspace_service.session.execute(stmt)).scalars().all())
-        if slugs:
-            skills = self._dedupe_skills_by_effective_slug(
-                skills,
-                requested_slugs=slugs,
-            )
+        skills = self._dedupe_skills_by_effective_slug(
+            skills,
+            requested_slugs=slugs or None,
+        )
         versions_by_slug: dict[str, set[int]] = defaultdict(set)
         for slug, version in refs.versioned_slugs:
             versions_by_slug[slug].add(version)