Skip to content

fix: CLI setup avoids legacy npm checks and shared-install uninstalls #1040

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 6 commits into from
May 3, 2026
Merged

fix: CLI setup avoids legacy npm checks and shared-install uninstalls #1040

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc1b512
Remove legacy npm detection from CLI install flow
hatayama May 3, 2026
e96cd44
Fix review findings for CLI install cleanup
hatayama May 3, 2026
767bb28
Pin the Go CLI build toolchain
hatayama May 3, 2026
9938a87
Merge v3-beta into CLI cleanup branch
hatayama May 3, 2026
581a4ff
Fix WSL drive-root home normalization
hatayama May 3, 2026
4e4f371
Include Go version file in security scan filters
hatayama May 3, 2026
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
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: '1.26.1'
go-version-file: Packages/src/GoCli~/.go-version
cache-dependency-path: Packages/src/GoCli~/go.sum

- name: Install golangci-lint
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/native-cli-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: '1.26.1'
go-version-file: Packages/src/GoCli~/.go-version
cache-dependency-path: Packages/src/GoCli~/go.sum

- name: Install golangci-lint
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/security-scan.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ on:
- 'Assets/**/*.cs'
- 'Packages/src/GoCli~/**/*.go'
- 'Packages/src/GoCli~/.golangci.yml'
- 'Packages/src/GoCli~/.go-version'
- 'Packages/src/GoCli~/go.mod'
- 'Packages/src/GoCli~/go.sum'
pull_request:
Expand All @@ -17,6 +18,7 @@ on:
- 'Assets/**/*.cs'
- 'Packages/src/GoCli~/**/*.go'
- 'Packages/src/GoCli~/.golangci.yml'
- 'Packages/src/GoCli~/.go-version'
- 'Packages/src/GoCli~/go.mod'
- 'Packages/src/GoCli~/go.sum'
workflow_dispatch:
Expand Down Expand Up @@ -112,7 +114,7 @@ jobs:
- name: Setup Go
uses: actions/setup-go@v6
with:
go-version: '1.26.1'
go-version-file: Packages/src/GoCli~/.go-version
Comment thread
cubic-dev-ai[bot] marked this conversation as resolved.
cache-dependency-path: Packages/src/GoCli~/go.sum

- name: Install golangci-lint
Expand Down
30 changes: 18 additions & 12 deletions Assets/Tests/Editor/CliSetupSectionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,21 @@ namespace io.github.hatayama.UnityCliLoop.Tests.Editor
{
public class CliSetupSectionTests
{
[TestCase(false, false, false, false, false, null, "3.0.0", "Install CLI")]
[TestCase(true, false, false, false, false, "3.0.0", "3.0.0", "Uninstall CLI")]
[TestCase(true, false, false, true, false, "2.9.0", "3.0.0", "Update CLI (v2.9.0 \u2192 v3.0.0)")]
[TestCase(true, false, false, false, true, "3.1.0", "3.0.0", "Downgrade CLI (v3.1.0 \u2192 v3.0.0)")]
[TestCase(true, true, false, false, false, "3.0.0", "3.0.0", "Uninstalling...")]
[TestCase(false, true, false, false, false, null, "3.0.0", "Installing...")]
[TestCase(false, false, true, false, false, null, "3.0.0", "Checking...")]
[TestCase(false, false, false, false, false, false, null, "3.0.0", "Install CLI")]
[TestCase(true, false, false, false, false, true, "3.0.0", "3.0.0", "Uninstall CLI")]
[TestCase(true, false, false, false, false, false, "3.0.0", "3.0.0", "Install CLI")]
[TestCase(true, false, false, true, false, true, "2.9.0", "3.0.0", "Update CLI (v2.9.0 \u2192 v3.0.0)")]
[TestCase(true, false, false, false, true, true, "3.1.0", "3.0.0", "Downgrade CLI (v3.1.0 \u2192 v3.0.0)")]
[TestCase(true, true, false, false, false, true, "3.0.0", "3.0.0", "Uninstalling...")]
[TestCase(false, true, false, false, false, false, null, "3.0.0", "Installing...")]
[TestCase(false, false, true, false, false, false, null, "3.0.0", "Checking...")]
public void GetInstallCliButtonText_ReturnsExpectedText(
bool isCliInstalled,
bool isInstallingCli,
bool isChecking,
bool needsUpdate,
bool needsDowngrade,
bool canUninstallCli,
string cliVersion,
string packageVersion,
string expectedText)
Expand All @@ -27,6 +29,7 @@ public void GetInstallCliButtonText_ReturnsExpectedText(
isChecking,
needsUpdate,
needsDowngrade,
canUninstallCli,
cliVersion,
packageVersion);

Expand All @@ -48,20 +51,23 @@ public void IsInstallCliButtonEnabled_ReturnsExpectedValue(
Assert.That(enabled, Is.EqualTo(expectedEnabled));
}

[TestCase(true, false, false, true)]
[TestCase(false, false, false, false)]
[TestCase(true, true, false, false)]
[TestCase(true, false, true, false)]
[TestCase(true, false, false, true, true)]
[TestCase(true, false, false, false, false)]
[TestCase(false, false, false, true, false)]
[TestCase(true, true, false, true, false)]
[TestCase(true, false, true, true, false)]
public void IsUninstallCliAction_ReturnsExpectedValue(
bool isCliInstalled,
bool needsUpdate,
bool needsDowngrade,
bool canUninstallCli,
bool expected)
{
bool result = CliSetupSection.IsUninstallCliAction(
isCliInstalled,
needsUpdate,
needsDowngrade);
needsDowngrade,
canUninstallCli);

Assert.That(result, Is.EqualTo(expected));
}
Expand Down
58 changes: 0 additions & 58 deletions Assets/Tests/Editor/LegacyNpmRemovalPromptTests.cs
View file
Open in desktop

This file was deleted.

11 changes: 0 additions & 11 deletions Assets/Tests/Editor/LegacyNpmRemovalPromptTests.cs.meta
View file
Open in desktop

This file was deleted.

15 changes: 9 additions & 6 deletions Assets/Tests/Editor/McpEditorWindowCliActionTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,22 @@ namespace io.github.hatayama.UnityCliLoop.Tests.Editor
{
public class McpEditorWindowCliActionTests
{
[TestCase(null, "3.0.0", false)]
[TestCase("2.9.0", "3.0.0", false)]
[TestCase("3.1.0", "3.0.0", false)]
[TestCase("3.0.0", "3.0.0", true)]
[TestCase(null, "3.0.0", true, false)]
[TestCase("2.9.0", "3.0.0", true, false)]
[TestCase("3.1.0", "3.0.0", true, false)]
[TestCase("3.0.0", "3.0.0", true, true)]
[TestCase("3.0.0", "3.0.0", false, false)]
public void ShouldUninstallCliFromPrimaryButton_ReturnsExpectedAction(
string cliVersion,
string packageVersion,
bool canUninstallCli,
bool expected)
{
// Verifies that only same-version installs route the primary CLI button to uninstall.
// Verifies that only same-version package-owned installs route the primary CLI button to uninstall.
bool result = McpEditorWindow.ShouldUninstallCliFromPrimaryButton(
cliVersion,
packageVersion);
packageVersion,
canUninstallCli);

Assert.That(result, Is.EqualTo(expected));
}
Expand Down
Loading