refactor: Improve the installation of skills

Author: edenreich

.infer/shortcuts/skills.yaml

@@ -4,7 +4,7 @@
 #
 # Usage:
 # - /skills list - List discovered skills
-# - /skills install <github-url> - Install a skill from a public GitHub repo
+# - /skills install <skill | org/skill | github-url> - Install a skill
 # - /skills uninstall <name> - Uninstall a skill by name
 
 shortcuts:
@@ -17,6 +17,6 @@ shortcuts:
       - name: list
         description: "List discovered skills"
       - name: install
-        description: "Install a skill from a public GitHub repo (usage: <github-url> [--user] [--overwrite])"
+        description: "Install a skill (usage: <skill> | <org>/<skill> | <github-url>) [--user] [--overwrite]"
       - name: uninstall
         description: "Uninstall a skill by name (usage: <name> [--user])"

cmd/init.go

@@ -705,7 +705,7 @@ func createSkillsShortcutsFile(path string) error {
 #
 # Usage:
 # - /skills list - List discovered skills
-# - /skills install <github-url> - Install a skill from a public GitHub repo
+# - /skills install <skill | org/skill | github-url> - Install a skill
 # - /skills uninstall <name> - Uninstall a skill by name
 
 shortcuts:
@@ -718,7 +718,7 @@ shortcuts:
       - name: list
         description: "List discovered skills"
       - name: install
-        description: "Install a skill from a public GitHub repo (usage: <github-url> [--user] [--overwrite])"
+        description: "Install a skill (usage: <skill> | <org>/<skill> | <github-url>) [--user] [--overwrite]"
       - name: uninstall
         description: "Uninstall a skill by name (usage: <name> [--user])"
 `

cmd/skills.go

@@ -113,14 +113,25 @@ func listSkills(cmd *cobra.Command, _ []string) error {
 }
 
 var skillsInstallCmd = &cobra.Command{
-	Use:   "install <github-url>",
+	Use:   "install <skill | org/skill | github-url>",
 	Short: "Install a skill from a public GitHub repository",
-	Long: `Install a skill folder directly from a public GitHub repository.
+	Long: `Install a skill folder from a public GitHub repository.
 
-The URL must point at a directory inside a repo, formatted as:
-  https://github.com/<owner>/<repo>/tree/<ref>/<path-to-skill-folder>
+You can pass any of the following:
 
-Example:
+  - A skill name:           skill-creator
+      → https://github.com/inference-gateway/skills/tree/main/skills/skill-creator
+  - An <org>/<skill> pair:  acme/skill-creator
+      → https://github.com/acme/skills/tree/main/skills/skill-creator
+  - A full GitHub tree URL: https://github.com/<owner>/<repo>/tree/<ref>/<path>
+
+Shorthand forms assume the skill lives under skills/<name>/ inside a repo
+named "skills" on the given org, and resolve against the "main" branch.
+For any other layout, branch, or tag, use the full URL form.
+
+Examples:
+  infer skills install skill-creator
+  infer skills install acme/internal-comms
   infer skills install https://github.com/anthropics/skills/tree/main/skills/pdf
 
 By default the skill is written to .infer/skills/<dirname>/. Pass --user

internal/services/skills/install.go

@@ -10,6 +10,7 @@ import (
 	"os"
 	"path"
 	"path/filepath"
+	"slices"
 	"strings"
 	"time"
 
@@ -22,8 +23,46 @@ const (
 	installerTimeout  = 30 * time.Second
 	installerUA       = "inference-gateway-cli"
 	treePartsExpected = 5
+
+	defaultSkillsOrg    = "inference-gateway"
+	defaultSkillsRepo   = "skills"
+	defaultSkillsRef    = "main"
+	defaultSkillsSubdir = "skills"
 )
 
+// ExpandShorthand turns shorthand install targets into full GitHub
+// tree URLs. Accepted forms:
+//
+//   - "<skill>"          → https://github.com/inference-gateway/skills/tree/main/skills/<skill>
+//   - "<org>/<skill>"    → https://github.com/<org>/skills/tree/main/skills/<skill>
+//   - any http(s):// URL → returned unchanged
+//
+// Anything else (3+ slash-separated segments, empty segments, etc.) is
+// returned unchanged so ParseGitHubTreeURL produces its existing error.
+func ExpandShorthand(input string) string {
+	if strings.HasPrefix(input, "http://") || strings.HasPrefix(input, "https://") {
+		return input
+	}
+	trimmed := strings.Trim(input, "/")
+	if trimmed == "" {
+		return input
+	}
+	parts := strings.Split(trimmed, "/")
+	if slices.Contains(parts, "") {
+		return input
+	}
+	switch len(parts) {
+	case 1:
+		return fmt.Sprintf("https://github.com/%s/%s/tree/%s/%s/%s",
+			defaultSkillsOrg, defaultSkillsRepo, defaultSkillsRef, defaultSkillsSubdir, parts[0])
+	case 2:
+		return fmt.Sprintf("https://github.com/%s/%s/tree/%s/%s/%s",
+			parts[0], defaultSkillsRepo, defaultSkillsRef, defaultSkillsSubdir, parts[1])
+	default:
+		return input
+	}
+}
+
 // GitHubLocation identifies a directory inside a public GitHub repository,
 // parsed out of a /tree/<ref>/<path> URL.
 type GitHubLocation struct {
@@ -105,6 +144,7 @@ func NewInstaller() *Installer {
 //
 // Returns the absolute path of the installed skill on success.
 func (i *Installer) InstallFromGitHub(ctx context.Context, rawURL, destBase string, overwrite bool) (string, error) {
+	rawURL = ExpandShorthand(rawURL)
 	loc, err := ParseGitHubTreeURL(rawURL)
 	if err != nil {
 		return "", err

internal/services/skills/install_test.go

@@ -13,6 +13,66 @@ import (
 	require "github.com/stretchr/testify/require"
 )
 
+func TestExpandShorthand(t *testing.T) {
+	tests := []struct {
+		name  string
+		input string
+		want  string
+	}{
+		{
+			name:  "single segment uses default org and skills repo",
+			input: "skill-creator",
+			want:  "https://github.com/inference-gateway/skills/tree/main/skills/skill-creator",
+		},
+		{
+			name:  "two segments use given org and skills repo",
+			input: "acme/foo",
+			want:  "https://github.com/acme/skills/tree/main/skills/foo",
+		},
+		{
+			name:  "https URL is returned unchanged",
+			input: "https://github.com/anthropics/skills/tree/main/skills/pdf",
+			want:  "https://github.com/anthropics/skills/tree/main/skills/pdf",
+		},
+		{
+			name:  "http URL is returned unchanged",
+			input: "http://example.com/x",
+			want:  "http://example.com/x",
+		},
+		{
+			name:  "empty input is returned unchanged",
+			input: "",
+			want:  "",
+		},
+		{
+			name:  "three segments fall through unchanged",
+			input: "a/b/c",
+			want:  "a/b/c",
+		},
+		{
+			name:  "leading and trailing slashes are trimmed",
+			input: "/skill/",
+			want:  "https://github.com/inference-gateway/skills/tree/main/skills/skill",
+		},
+		{
+			name:  "empty middle segment falls through unchanged",
+			input: "a//b",
+			want:  "a//b",
+		},
+		{
+			name:  "single slash falls through unchanged",
+			input: "/",
+			want:  "/",
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			require.Equal(t, tt.want, ExpandShorthand(tt.input))
+		})
+	}
+}
+
 func TestParseGitHubTreeURL(t *testing.T) {
 	tests := []struct {
 		name    string
@@ -168,6 +228,30 @@ func TestInstallFromGitHub_HappyPath(t *testing.T) {
 	require.True(t, os.IsNotExist(err))
 }
 
+func TestInstallFromGitHub_ShorthandResolves(t *testing.T) {
+	// Shorthand "acme/skill-creator" should resolve to the "skills" repo
+	// under the acme org with path "skills/skill-creator". The mock server
+	// doesn't care about owner/repo/ref segments — it just looks at the
+	// repo path prefix — so we need a SKILL.md at
+	// skills/skill-creator/SKILL.md to match the resolved tree path.
+	repo := fakeRepo{
+		Files: map[string]string{
+			"skills/skill-creator/SKILL.md": validSkillBody("skill-creator", "Test skill."),
+		},
+	}
+	srv := newMockServer(t, repo)
+	defer srv.Close()
+
+	dest := t.TempDir()
+	got, err := newTestInstaller(srv.URL).InstallFromGitHub(context.Background(),
+		"acme/skill-creator", dest, false)
+	require.NoError(t, err)
+
+	abs, _ := filepath.Abs(filepath.Join(dest, "skill-creator"))
+	require.Equal(t, abs, got)
+	require.FileExists(t, filepath.Join(dest, "skill-creator", "SKILL.md"))
+}
+
 func TestInstallFromGitHub_RepoNotFound(t *testing.T) {
 	mux := http.NewServeMux()
 	mux.HandleFunc("/repos/", func(w http.ResponseWriter, r *http.Request) {