Skip to content

chore: Share v3 migration skill target handling #1609

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hatayama merged 1 commit into from
Jul 8, 2026
Merged

chore: Share v3 migration skill target handling #1609

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 45 additions & 0 deletions Assets/Tests/Editor/ToolSkillSynchronizerTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,6 +1638,51 @@ await V3MigrationSkillInstaller.RemoveSpecificSkillFilesAtProjectRoot(
Assert.That(Directory.Exists(unrelatedSkillDir), Is.True);
}

[Test]
public async Task RemoveSpecificSkillFilesAtProjectRoot_WithMultipleTargets_ReportsAllTargetsSucceeded()
{
// Tests that migration skill removal reports one successful result per requested target.
string temporaryRoot = CreateTemporaryProjectRoot();
ToolSkillSynchronizer.SkillTargetInfo codexTarget = new(
"Codex CLI",
".codex",
"--codex",
hasSkillsDirectory: true,
hasExistingSkills: false);
ToolSkillSynchronizer.SkillTargetInfo claudeTarget = new(
"Claude Code",
".claude",
"--claude",
hasSkillsDirectory: true,
hasExistingSkills: false);
string codexSkillDir = Path.Combine(
temporaryRoot,
".codex",
SkillInstallLayout.SkillsDirName,
CliConstants.V3_CLI_INVOCATION_MIGRATION_SKILL_NAME);
string claudeSkillDir = Path.Combine(
temporaryRoot,
".claude",
SkillInstallLayout.SkillsDirName,
CliConstants.V3_CLI_INVOCATION_MIGRATION_SKILL_NAME);
WriteSkillFile(codexSkillDir, "---\nname: v3-cli-invocation-migration\n---\n");
WriteSkillFile(claudeSkillDir, "---\nname: v3-cli-invocation-migration\n---\n");

ToolSkillSynchronizer.SkillInstallResult result =
await V3MigrationSkillInstaller.RemoveSpecificSkillFilesAtProjectRoot(
temporaryRoot,
new[] { codexTarget, claudeTarget },
CliConstants.V3_CLI_INVOCATION_MIGRATION_SKILL_NAME,
groupSkillsUnderUnityCliLoop: false,
ct: CancellationToken.None);

Assert.That(result.AttemptedTargets, Is.EqualTo(2));
Assert.That(result.SucceededTargets, Is.EqualTo(2));
Assert.That(result.IsSuccessful, Is.True);
Assert.That(Directory.Exists(codexSkillDir), Is.False);
Assert.That(Directory.Exists(claudeSkillDir), Is.False);
}

[Test]
public async Task RemoveV3MigrationSkillFilesAtProjectRoot_WhenSkillExistsInBothLayouts_RemovesBothLayouts()
{
Expand Down
67 changes: 36 additions & 31 deletions Packages/src/Editor/Infrastructure/SkillSetup/V3MigrationSkillInstaller.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,29 +72,23 @@ internal static SkillInstallState GetV3MigrationSkillInstallStateAtProjectRoot(
ct.ThrowIfCancellationRequested();

SkillInstallLayout.SkillSourceInfo skill = GetV3MigrationSkillSourceInfo();
ToolSkillSynchronizer.SkillTargetInfo[] targetArray = targets.ToArray();
return await Task.Run(() =>
{
int succeeded = 0;
foreach (ToolSkillSynchronizer.SkillTargetInfo target in targetArray)
return await RunForTargetsAsync(
targets,
(ToolSkillSynchronizer.SkillTargetInfo target, CancellationToken targetCt) =>
{
ct.ThrowIfCancellationRequested();
string targetRoot = Path.Combine(projectRoot, target.DirName);
SkillTargetInstaller.DeleteSkillDirectoryIfExists(
targetRoot,
skill.Name,
groupSkillsUnderUnityCliLoop,
ct);
targetCt);
SkillTargetInstaller.DeleteSkillDirectoryIfExists(
targetRoot,
skill.Name,
!groupSkillsUnderUnityCliLoop,
ct);
succeeded++;
}

return new ToolSkillSynchronizer.SkillInstallResult(targetArray.Length, succeeded);
}, ct);
targetCt);
},
ct);
}

internal static SkillInstallState GetSkillInstallStateAtProjectRoot(
Expand Down Expand Up @@ -129,25 +123,19 @@ internal static SkillInstallState GetSkillInstallStateAtProjectRoot(
Debug.Assert(targets != null, "targets must not be null");
ct.ThrowIfCancellationRequested();

ToolSkillSynchronizer.SkillTargetInfo[] targetArray = targets.ToArray();
return await Task.Run(() =>
{
int succeeded = 0;
foreach (ToolSkillSynchronizer.SkillTargetInfo target in targetArray)
return await RunForTargetsAsync(
targets,
(ToolSkillSynchronizer.SkillTargetInfo target, CancellationToken targetCt) =>
{
ct.ThrowIfCancellationRequested();
SkillTargetInstaller.InstallSpecificSkillsForTarget(
projectRoot,
target,
Array.Empty<SkillInstallLayout.SkillSourceInfo>(),
new[] { skill },
groupSkillsUnderUnityCliLoop,
ct);
succeeded++;
}

return new ToolSkillSynchronizer.SkillInstallResult(targetArray.Length, succeeded);
}, ct);
targetCt);
},
ct);
}

internal static async Task<ToolSkillSynchronizer.SkillInstallResult> RemoveSpecificSkillFilesAtProjectRoot(
Expand All @@ -162,19 +150,36 @@ internal static SkillInstallState GetSkillInstallStateAtProjectRoot(
Debug.Assert(!string.IsNullOrEmpty(skillName), "skillName must not be null or empty");
ct.ThrowIfCancellationRequested();

return await RunForTargetsAsync(
targets,
(ToolSkillSynchronizer.SkillTargetInfo target, CancellationToken targetCt) =>
{
string targetRoot = Path.Combine(projectRoot, target.DirName);
SkillTargetInstaller.DeleteSkillDirectoryIfExists(
targetRoot,
skillName,
groupSkillsUnderUnityCliLoop,
targetCt);
},
ct);
}

private static async Task<ToolSkillSynchronizer.SkillInstallResult> RunForTargetsAsync(
IEnumerable<ToolSkillSynchronizer.SkillTargetInfo> targets,
Action<ToolSkillSynchronizer.SkillTargetInfo, CancellationToken> targetOperation,
CancellationToken ct)
{
Debug.Assert(targets != null, "targets must not be null");
Debug.Assert(targetOperation != null, "targetOperation must not be null");

ToolSkillSynchronizer.SkillTargetInfo[] targetArray = targets.ToArray();
return await Task.Run(() =>
{
int succeeded = 0;
foreach (ToolSkillSynchronizer.SkillTargetInfo target in targetArray)
{
ct.ThrowIfCancellationRequested();
string targetRoot = Path.Combine(projectRoot, target.DirName);
SkillTargetInstaller.DeleteSkillDirectoryIfExists(
targetRoot,
skillName,
groupSkillsUnderUnityCliLoop,
ct);
targetOperation(target, ct);
succeeded++;
}

Expand Down
Loading