Skip to content

feat(#7008): accept .claude-plugin/plugin.json in lock URL stripping #7030

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

Closed
fullsend-ai-coder wants to merge 1 commit into from
+26 −3
Closed

feat(#7008): accept .claude-plugin/plugin.json in lock URL stripping #7030

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
17 changes: 14 additions & 3 deletions internal/cli/lock.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,9 +1137,11 @@ func isTreeLockField(field string) bool {
// use forge tree URLs whose deepest path segment is the directory name.
// Base-composed entries (see fetchBaseSkill/fetchBasePlugin in
// internal/harness/compose.go) record raw.githubusercontent.com URLs pointing
// at the marker file (SKILL.md or plugin.json); only those two names are
// treated as markers and stripped — any other raw URL keeps its last segment
// as the directory name.
// at the marker file (SKILL.md, plugin.json, or .claude-plugin/plugin.json);
// those names are treated as markers and stripped — any other raw URL keeps
// its last segment as the directory name. .claude-plugin/plugin.json is the
// Claude Code plugin spec location; stripping it requires removing two path
// segments so the caller gets the plugin root, not ".claude-plugin".
func lockTreeDirName(field, lockURL string) (string, error) {
if forgeInfo, err := forge.ParseForgeURL(lockURL); err == nil {
if forgeInfo.Path == "" {
Expand All @@ -1153,6 +1155,15 @@ func lockTreeDirName(field, lockURL string) (string, error) {
if dir == "." {
return "", fmt.Errorf("%s: URL must point to a marker file inside a directory, not the repo root", field)
}
// .claude-plugin/plugin.json is a two-level marker per the
// Claude Code plugin spec; strip the intermediate directory
// so the caller gets the plugin root, not ".claude-plugin".
if last == "plugin.json" && path.Base(dir) == ".claude-plugin" {
dir = path.Dir(dir)
if dir == "." {
return "", fmt.Errorf("%s: URL must point to a marker file inside a directory, not the repo root", field)
}
}
return filepath.Base(dir), nil
}
return path.Base(rawInfo.Path), nil
Expand Down
12 changes: 12 additions & 0 deletions internal/cli/lock_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2437,6 +2437,18 @@ func TestLockTreeDirName(t *testing.T) {
url: "https://raw.githubusercontent.com/org/repo/abc123/plugins/gopls-lsp/plugin.json",
want: "gopls-lsp",
},
{
name: "raw .claude-plugin/plugin.json marker stripped",
field: "plugins[0]",
url: "https://raw.githubusercontent.com/org/repo/abc123/plugins/my-plugin/.claude-plugin/plugin.json",
want: "my-plugin",
},
{
name: "raw .claude-plugin/plugin.json at ref root rejected",
field: "plugins[0]",
url: "https://raw.githubusercontent.com/org/repo/abc123/.claude-plugin/plugin.json",
wantErr: "must point to a marker file inside a directory",
},
{
name: "raw marker at ref root rejected",
field: "skills[0]",
Expand Down
Loading