Skip to content

fix: Setup falls back to skill target selection when folders are missing #1839

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 19, 2026
Merged

fix: Setup falls back to skill target selection when folders are missing #1839

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
16 changes: 16 additions & 0 deletions Assets/Tests/Editor/SetupWizardWindowTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,6 +462,22 @@ public void FilterInstallableSkillTargets_ExcludesTargetsWithoutSkillsDirectory(
Assert.That(installableTargets[1].DirName, Is.EqualTo(".codex"));
}

[TestCase(true, 0, true)]
[TestCase(false, 0, true)]
[TestCase(false, 1, false)]
public void ResolveUseFirstInstallSkillsUi_ReturnsExpectedMode(
bool shouldUseFirstInstallSkillsUi,
int installableTargetCount,
bool expected)
{
// Verifies that empty installable target results fall back to the first-install skill UI.
bool actual = SetupWizardSkillsStepPresenter.ResolveUseFirstInstallSkillsUi(
shouldUseFirstInstallSkillsUi,
installableTargetCount);

Assert.That(actual, Is.EqualTo(expected));
}

[Test]
public void ShouldUseFirstInstallSkillsUi_WhenVersionWasNeverSeen_ReturnsTrue()
{
Expand Down
32 changes: 18 additions & 14 deletions Packages/src/Editor/Presentation/Setup/SetupWizardSkillsStepPresenter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,17 @@ internal void Update(
bool groupSkillsUnderUnityCliLoop,
bool isInstallingSkills)
{
List<SkillSetupTargetInfo> installableTargets = FilterInstallableSkillTargets(targets);
bool useFirstInstallSkillsUi = ResolveUseFirstInstallSkillsUi(
shouldUseFirstInstallSkillsUi,
installableTargets.Count);
_skillsTargetList.Clear();
ViewDataBinder.SetVisible(
_skillsTargetRow,
ShouldShowSkillsTargetRowForSetupWizard(shouldUseFirstInstallSkillsUi));
ShouldShowSkillsTargetRowForSetupWizard(useFirstInstallSkillsUi));
ViewDataBinder.SetVisible(
_skillsTargetList,
ShouldShowSkillsTargetListForSetupWizard(canManageSkills, shouldUseFirstInstallSkillsUi));
ShouldShowSkillsTargetListForSetupWizard(canManageSkills, useFirstInstallSkillsUi));

if (!canManageSkills)
{
Expand All @@ -84,7 +88,7 @@ internal void Update(
return;
}

if (shouldUseFirstInstallSkillsUi)
if (useFirstInstallSkillsUi)
{
SkillSetupTargetInfo selectedTargetInfo = GetSelectedSkillTargetInfo(
targets,
Expand All @@ -102,8 +106,6 @@ internal void Update(
return;
}

List<SkillSetupTargetInfo> installableTargets = FilterInstallableSkillTargets(targets);

foreach (SkillSetupTargetInfo target in installableTargets)
{
VisualElement item = new();
Expand All @@ -126,15 +128,6 @@ internal void Update(
_skillsTargetList.Add(item);
}

if (installableTargets.Count == 0)
{
UpdateSkillsStatusLabel(
"Create a tool folder to enable skill installation (.claude/, .agents/, etc.)");
_installSkillsButton.SetEnabled(false);
_installSkillsButton.text = "Install Skills";
return;
}

bool isCheckingSkills = installableTargets.Any(
t => t.InstallState == SkillInstallState.Checking);
if (isCheckingSkills)
Expand Down Expand Up @@ -175,6 +168,17 @@ internal static List<SkillSetupTargetInfo> FilterInstallableSkillTargets(
.ToList();
}

/// <summary>
/// Resolves whether the setup wizard should show the first-install skill UI.
/// </summary>
internal static bool ResolveUseFirstInstallSkillsUi(
bool shouldUseFirstInstallSkillsUi,
int installableTargetCount)
{
Debug.Assert(installableTargetCount >= 0, "installableTargetCount must not be negative");
return shouldUseFirstInstallSkillsUi || installableTargetCount == 0;
}

internal static bool ShouldShowSkillsTargetRowForSetupWizard(bool shouldUseFirstInstallSkillsUi)
{
return shouldUseFirstInstallSkillsUi;
Expand Down
9 changes: 7 additions & 2 deletions Packages/src/Editor/Presentation/Setup/SetupWizardSkillsWorkflowController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,12 +225,17 @@ private async Task HandleInstallSkillsAsync(CancellationToken ct)
CancelSkillInstallStateRefresh();
string projectRoot = UnityCliLoopPathResolver.GetProjectRoot();
List<SkillSetupTargetInfo> targets = DetectDisplayedSkillTargets(projectRoot);
List<SkillSetupTargetInfo> installableTargets = _shouldUseFirstInstallSkillsUi
List<SkillSetupTargetInfo> filteredTargets =
SetupWizardSkillsStepPresenter.FilterInstallableSkillTargets(targets);
bool useFirstInstallSkillsUi = SetupWizardSkillsStepPresenter.ResolveUseFirstInstallSkillsUi(
_shouldUseFirstInstallSkillsUi,
filteredTargets.Count);
List<SkillSetupTargetInfo> installableTargets = useFirstInstallSkillsUi
? SetupWizardSkillsStepPresenter.GetFirstInstallableSkillTargets(
targets,
_skillsTarget,
!_installSkillsFlat)
: SetupWizardSkillsStepPresenter.FilterInstallableSkillTargets(targets);
: filteredTargets;
if (installableTargets.Count == 0) return;

bool shouldShowSkillsInstalledDialog =
Expand Down
Loading