Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 32 additions & 0 deletions Assets/Tests/Editor/SkillInstallLayoutTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,38 @@ public void GetSkillSourceInfos_WhenNamesOverlap_PrefersEarlierSourceRoot()
Assert.That(skillSources["uloop-manifest-priority"].ToolName, Is.EqualTo("manifest-winner"));
}

// Tests that local manifest dependencies do not also discover stale PackageCache-only skills.
[TestCase("file:")]
[TestCase("path:")]
public void GetSkillSourceInfos_WhenLocalDependencyHasStaleCache_ExcludesCacheOnlySkill(
string dependencyPrefix)
{
string temporaryRoot = CreateTemporaryProjectRoot();
string localPackageRoot = CreateTemporaryProjectRoot();
string cachePackageRoot = Path.Combine(
temporaryRoot,
"Library",
"PackageCache",
"com.example.local@1.0.0");
WriteSourceSkill(localPackageRoot, "uloop-local-skill", "local-tool", "LocalTool");
WriteSourceSkill(cachePackageRoot, "uloop-stale-cache-skill", "stale-tool", "StaleTool");

string manifestPath = Path.Combine(temporaryRoot, "Packages", "manifest.json");
Directory.CreateDirectory(Path.GetDirectoryName(manifestPath));
string portableLocalPackageRoot = localPackageRoot.Replace(Path.DirectorySeparatorChar, '/');
File.WriteAllText(
manifestPath,
$"{{\"dependencies\":{{\"com.example.local\":" +
$"\"{dependencyPrefix}{portableLocalPackageRoot}\"}}}}");

string[] skillNames = SkillInstallLayout.GetSkillSourceInfos(temporaryRoot)
.Select(skill => skill.Name)
.ToArray();

Assert.That(skillNames, Does.Contain("uloop-local-skill"));
Assert.That(skillNames, Does.Not.Contain("uloop-stale-cache-skill"));
}

// Tests that skill discovery follows bundled tools after they move into the first-party plugin assembly.
[Test]
public void GetSkillSourceInfos_WhenFirstPartyToolIsUnderFirstPartyTools_IncludesToolSkill()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -268,7 +268,9 @@ private static IEnumerable<string> EnumerateManifestLocalPackageRoots(string pro
private static IEnumerable<string> EnumerateDependencyPackageCacheRoots(string projectRoot)
{
HashSet<string> dependencyNames = new(
EnumerateManifestDependencies(projectRoot).Select(dependency => dependency.Key),
EnumerateManifestDependencies(projectRoot)
.Where(dependency => ResolveLocalDependencyPath(dependency.Value, projectRoot) == null)
.Select(dependency => dependency.Key),
StringComparer.OrdinalIgnoreCase);
if (dependencyNames.Count == 0)
{
Expand Down
5 changes: 4 additions & 1 deletion cli/common/skillscan/packages.go
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,10 @@ func enumeratePackageCacheResults(projectRoot string) []PackageSearchResult {
return []PackageSearchResult{}
}
dependencyNames := map[string]bool{}
for dependencyName := range dependencies {
for dependencyName, dependencyValue := range dependencies {
if resolveLocalDependencyPath(dependencyValue, projectRoot) != "" {
continue
}
dependencyNames[strings.ToLower(dependencyName)] = true
}
packageCacheDir := filepath.Join(projectRoot, "Library", "PackageCache")
Expand Down
34 changes: 34 additions & 0 deletions cli/common/skillscan/packages_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,40 @@ func TestEnumerateSourceRootsUsesPackageSearchResults(t *testing.T) {
}
}

// Tests that local manifest dependencies exclude stale roots with the same identity from PackageCache.
func TestEnumeratePackageSearchResultsExcludesStaleCacheForLocalDependencies(t *testing.T) {
for _, dependencyPrefix := range []string{"file:", "path:"} {
t.Run(dependencyPrefix, func(t *testing.T) {
projectRoot := t.TempDir()
localPackageRoot := filepath.Join(t.TempDir(), "local-package")
if err := os.MkdirAll(localPackageRoot, 0o755); err != nil {
t.Fatalf("failed to create local package: %v", err)
}
staleCacheRoot := filepath.Join(
projectRoot,
"Library",
"PackageCache",
"com.example.local@1.0.0")
if err := os.MkdirAll(staleCacheRoot, 0o755); err != nil {
t.Fatalf("failed to create stale cache package: %v", err)
}
writeManifest(
t,
projectRoot,
`{"dependencies":{"com.example.local":"`+dependencyPrefix+
filepath.ToSlash(localPackageRoot)+`"}}`)

results := EnumeratePackageSearchResults(projectRoot)

actual := packageResultSummaries(results)
expected := []string{"com.example.local|" + filepath.Clean(localPackageRoot)}
if !reflect.DeepEqual(actual, expected) {
t.Fatalf("package results mismatch:\nactual: %#v\nexpected: %#v", actual, expected)
}
})
}
}

// Tests that package search results expose stable package identities for direct, manifest, and cached roots.
func TestEnumeratePackageSearchResultsCapturesPackageIdentities(t *testing.T) {
projectRoot := t.TempDir()
Expand Down
2 changes: 1 addition & 1 deletion cli/dispatcher/shared-inputs-stamp.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"schemaVersion": 1,
"sharedInputsHash": "d2612511f3e961536ba7a96427b4aff4a6f6a2f3"
"sharedInputsHash": "c1b345cfb13b50c52c529f4746a4b481ddbd0615"
}
2 changes: 1 addition & 1 deletion cli/project-runner/shared-inputs-stamp.json
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{
"schemaVersion": 1,
"sharedInputsHash": "d61682d89b48e4595a01f18e08c3b96ed648e12a"
"sharedInputsHash": "beb7eb4a81fe05748dd1c11442357fbc06188c5d"
}
Loading