Skip to content

chore: Unify skill source discovery #1486

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 2 commits into from
Jul 4, 2026
Merged

chore: Unify skill source discovery #1486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c40e24f
Unify skill source root discovery
hatayama Jul 4, 2026
5a8fc41
Limit marker fallback for skill package identity
hatayama Jul 4, 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
36 changes: 0 additions & 36 deletions cli/common/clicore/skillscan_aliases.go
View file
Open in desktop

This file was deleted.

7 changes: 4 additions & 3 deletions cli/common/clicore/tool_catalog.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package clicore

import (
"github.com/hatayama/unity-cli-loop/common/skillscan"
"github.com/hatayama/unity-cli-loop/common/tools"
)

Expand All @@ -17,11 +18,11 @@ type (
)

func LoadTools(projectRoot string) (ToolsCache, error) {
return tools.Load(projectRoot, collectInternalSkillToolNames(projectRoot))
return tools.Load(projectRoot, skillscan.CollectInternalSkillToolNames(projectRoot))
}

func LoadProjectToolCache(projectRoot string) (ToolsCache, bool) {
return tools.LoadProjectCache(projectRoot, collectInternalSkillToolNames(projectRoot))
return tools.LoadProjectCache(projectRoot, skillscan.CollectInternalSkillToolNames(projectRoot))
}

func LoadDefaultTools() ToolsCache {
Expand All @@ -37,7 +38,7 @@ func FindDefaultTool(name string) (ToolDefinition, bool) {
}

func FindToolForCommand(projectRoot string, command string) (ToolDefinition, ToolsCache, bool, error) {
return findToolForCommandWithInternalToolNames(projectRoot, command, collectInternalSkillToolNames)
return findToolForCommandWithInternalToolNames(projectRoot, command, skillscan.CollectInternalSkillToolNames)
}

func findToolForCommandWithInternalToolNames(
Expand Down
3 changes: 2 additions & 1 deletion cli/common/clicore/tool_catalog_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"testing"

"github.com/hatayama/unity-cli-loop/common/clitest"
"github.com/hatayama/unity-cli-loop/common/skillscan"
)

// Tests that run-tests-specific help text does not leak into unrelated tool schemas.
Expand Down Expand Up @@ -340,5 +341,5 @@ func writeToolCache(t *testing.T, projectRoot string, content string) {
// shared clitest.WriteSkillFile helper, which owns the CRLF normalization.
func writeTestSkill(t *testing.T, projectRoot string, relativeDir string, content string) {
t.Helper()
clitest.WriteSkillFile(t, projectRoot, relativeDir, SkillFileName, content)
clitest.WriteSkillFile(t, projectRoot, relativeDir, skillscan.SkillFileName, content)
}
Loading
Loading