Skip to content

Support custom SSH usernames for install sources #178

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
runkids merged 2 commits into from
May 31, 2026
Merged

Support custom SSH usernames for install sources #178

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1226be9
fix: support custom SSH usernames
PeterTianbuhan May 31, 2026
5fd487b
fix: recognize GHE data residency hosts
PeterTianbuhan May 31, 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
1 change: 1 addition & 0 deletions internal/install/conflict_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ func TestNormalizeCloneURL(t *testing.T) {
{"https://github.com/owner/repo", "github.com/owner/repo"},
{"git@github.com:owner/repo.git", "github.com/owner/repo"},
{"git@github.com:owner/repo", "github.com/owner/repo"},
{"acme@acme.ghe.com:MyOrg/repo.git", "acme.ghe.com/myorg/repo"},
{"https://github.com/Owner/Repo.git", "github.com/owner/repo"},
{"https://github.com/owner/repo/", "github.com/owner/repo"},
{"http://github.com/owner/repo.git", "github.com/owner/repo"},
Expand Down
6 changes: 3 additions & 3 deletions internal/install/install.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,9 @@ func normalizeCloneURL(u string) string {
u = strings.TrimSpace(u)
u = strings.TrimSuffix(u, ".git")
u = strings.TrimSuffix(u, "/")
// git@github.com:owner/repo → github.com/owner/repo
if strings.HasPrefix(u, "git@") {
u = strings.TrimPrefix(u, "git@")
// user@github.com:owner/repo → github.com/owner/repo
if at := strings.Index(u, "@"); at > 0 && !strings.Contains(u, "://") {
u = u[at+1:]
u = strings.Replace(u, ":", "/", 1)
}
// https://github.com/owner/repo → github.com/owner/repo
Expand Down
33 changes: 17 additions & 16 deletions internal/install/source.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@ type Source struct {
// GitHub URL pattern: github.com/owner/repo[/path/to/subdir]
var githubPattern = regexp.MustCompile(`^(?:https?://)?github\.com/([^/]+)/([^/]+)(?:/(.+))?$`)

// Git SSH pattern: git@host:owner/repo[.git][//subdir]
var gitSSHPattern = regexp.MustCompile(`^git@([^:]+):([^/]+)/(.+?)(?:\.git)?(?://(.+))?$`)
// Git SSH pattern: user@host:owner/repo[.git][//subdir]
var gitSSHPattern = regexp.MustCompile(`^([^@:\s]+)@([^:\s]+):([^/]+)/(.+?)(?:\.git)?(?://(.+))?$`)

// Git HTTPS pattern: https://host/path (flexible path for GitLab subgroups)
var gitHTTPSPattern = regexp.MustCompile(`^(https?)://([^/]+)/(.+)$`)
Expand Down Expand Up @@ -179,7 +179,7 @@ func expandGitHubShorthand(input string) string {
if strings.HasPrefix(input, "github.com/") ||
strings.HasPrefix(input, "http://") ||
strings.HasPrefix(input, "https://") ||
strings.HasPrefix(input, "git@") ||
gitSSHPattern.MatchString(input) ||
strings.HasPrefix(input, "file://") ||
isLocalPath(input) {
return input
Expand Down Expand Up @@ -299,17 +299,18 @@ func trimSkillFileSuffix(path string, isBlob bool) (string, bool) {
}

func parseGitSSH(matches []string, source *Source) (*Source, error) {
// matches: [full, host, owner, repo, subdir]
host := matches[1]
owner := matches[2]
repo := strings.TrimSuffix(matches[3], ".git")
// matches: [full, user, host, owner, repo, subdir]
user := matches[1]
host := matches[2]
owner := matches[3]
repo := strings.TrimSuffix(matches[4], ".git")
subdir := ""
if len(matches) > 4 {
subdir = matches[4]
if len(matches) > 5 {
subdir = matches[5]
}

source.Type = SourceTypeGitSSH
source.CloneURL = fmt.Sprintf("git@%s:%s/%s.git", host, owner, repo)
source.CloneURL = fmt.Sprintf("%s@%s:%s/%s.git", user, host, owner, repo)

if subdir != "" {
source.Subdir = subdir
Expand Down Expand Up @@ -541,13 +542,13 @@ func (s *Source) gitHubOwnerRepo() (owner, repo string) {
return "", ""
}

// SSH clone URL: git@host:owner/repo.git
// SSH clone URL: user@host:owner/repo.git
if sshMatches := gitSSHPattern.FindStringSubmatch(cloneURL); sshMatches != nil {
host := strings.ToLower(strings.TrimSpace(sshMatches[1]))
host := strings.ToLower(strings.TrimSpace(sshMatches[2]))
if !strings.Contains(host, "github") {
return "", ""
}
Comment on lines +547 to 550
Copy link
Copy Markdown

@gemini-code-assist gemini-code-assist Bot May 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

high

For GitHub Enterprise Data Residency environments (which use *.ghe.com domains), the host will not contain the substring "github". As a result, gitHubOwnerRepo() will fail to extract the owner and repository name, returning empty strings. This will break any GitHub-specific integrations or metadata extraction for these sources.

Please update the host check to also recognize ghe.com domains. Note that you should also apply a similar update to the HTTPS parsing logic below (around line 559), although it is outside the current diff hunk.

Suggested change
host := strings.ToLower(strings.TrimSpace(sshMatches[2]))
if !strings.Contains(host, "github") {
return "", ""
}
host := strings.ToLower(strings.TrimSpace(sshMatches[2]))
if !strings.Contains(host, "github") && !strings.Contains(host, "ghe.com") {
return "", ""
}

return sshMatches[2], strings.TrimSuffix(sshMatches[3], ".git")
return sshMatches[3], strings.TrimSuffix(sshMatches[4], ".git")
}

u, err := url.Parse(cloneURL)
Expand Down Expand Up @@ -614,10 +615,10 @@ func (s *Source) TrackName() string {
}
}

// Try SSH format: git@host:owner/repo.git
// Try SSH format: user@host:owner/repo.git
if sshMatches := gitSSHPattern.FindStringSubmatch(s.Raw); sshMatches != nil {
owner := sshMatches[2]
repo := strings.TrimSuffix(sshMatches[3], ".git")
owner := sshMatches[3]
repo := strings.TrimSuffix(sshMatches[4], ".git")
// Replace / with - to handle subgroup paths (e.g., group/subgroup/repo)
return owner + "-" + strings.ReplaceAll(repo, "/", "-")
}
Expand Down
31 changes: 31 additions & 0 deletions internal/install/source_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -215,6 +215,18 @@ func TestParseSource_GitSSH(t *testing.T) {
wantCloneURL: "git@gitlab.com:user/repo.git",
wantName: "repo",
},
{
name: "custom ssh username",
input: "acme@acme.ghe.com:MyOrg/my-skills.git",
wantCloneURL: "acme@acme.ghe.com:MyOrg/my-skills.git",
wantName: "my-skills",
},
{
name: "custom ssh username without .git",
input: "acme@acme.ghe.com:MyOrg/my-skills",
wantCloneURL: "acme@acme.ghe.com:MyOrg/my-skills.git",
wantName: "my-skills",
},
{
name: "gitlab ssh nested subgroup",
input: "git@gitlab.example.com:org/subgroup/my-skills.git",
Expand Down Expand Up @@ -255,6 +267,13 @@ func TestParseSource_GitSSH(t *testing.T) {
wantSubdir: "pdf",
wantName: "pdf",
},
{
name: "custom ssh username with subpath",
input: "acme@acme.ghe.com:MyOrg/my-skills.git//agents/reviewer",
wantCloneURL: "acme@acme.ghe.com:MyOrg/my-skills.git",
wantSubdir: "agents/reviewer",
wantName: "reviewer",
},
}

for _, tt := range tests {
Expand Down Expand Up @@ -823,6 +842,13 @@ func TestParseSource_GitHubEnterprise(t *testing.T) {
wantCloneURL: "git@mycompany.github.com:team/skills.git",
wantName: "skills",
},
{
name: "GHE Data Residency SSH",
input: "acme@acme.ghe.com:MyOrg/my-skills.git",
wantType: SourceTypeGitSSH,
wantCloneURL: "acme@acme.ghe.com:MyOrg/my-skills.git",
wantName: "my-skills",
},
{
name: "GHE SSH with subdir",
input: "git@github.mycompany.com:org/repo.git//path/to/skill",
Expand Down Expand Up @@ -876,6 +902,11 @@ func TestParseSource_GitHubEnterprise_TrackName(t *testing.T) {
raw: "git@github.mycompany.com:org/skills.git",
want: "org-skills",
},
{
name: "GHE Data Residency SSH",
raw: "acme@acme.ghe.com:MyOrg/my-skills.git",
want: "MyOrg-my-skills",
},
}

for _, tt := range tests {
Expand Down
Loading