List configured plugin marketplaces

Author: SqlRush

cmd/claude/main.go

@@ -316,6 +316,16 @@ type pluginCLIAvailableList struct {
 	Available []pluginCLIAvailableEntry `json:"available"`
 }
 
+type pluginCLIMarketplaceEntry struct {
+	Name            string `json:"name"`
+	Source          string `json:"source,omitempty"`
+	Repo            string `json:"repo,omitempty"`
+	URL             string `json:"url,omitempty"`
+	Path            string `json:"path,omitempty"`
+	Package         string `json:"package,omitempty"`
+	InstallLocation string `json:"installLocation,omitempty"`
+}
+
 func runPluginCLI(ctx context.Context, state *bootstrap.State, args []string, stdout io.Writer, stderr io.Writer) int {
 	_ = ctx
 	if len(args) == 0 {
@@ -325,6 +335,8 @@ func runPluginCLI(ctx context.Context, state *bootstrap.State, args []string, st
 	switch strings.ToLower(strings.TrimSpace(args[0])) {
 	case "list", "ls":
 		return runPluginListCLI(state, args[1:], stdout, stderr)
+	case "marketplace", "marketplaces":
+		return runPluginMarketplaceCLI(state, args[1:], stdout, stderr)
 	default:
 		fmt.Fprintf(stderr, "ccgo plugin: unsupported subcommand %s\n", args[0])
 		return 2
@@ -393,6 +405,66 @@ func runPluginListCLI(state *bootstrap.State, args []string, stdout io.Writer, s
 	return 0
 }
 
+func runPluginMarketplaceCLI(state *bootstrap.State, args []string, stdout io.Writer, stderr io.Writer) int {
+	if len(args) == 0 {
+		fmt.Fprintln(stderr, "ccgo plugin marketplace: missing subcommand")
+		return 2
+	}
+	switch strings.ToLower(strings.TrimSpace(args[0])) {
+	case "list", "ls":
+		return runPluginMarketplaceListCLI(state, args[1:], stdout, stderr)
+	default:
+		fmt.Fprintf(stderr, "ccgo plugin marketplace: unsupported subcommand %s\n", args[0])
+		return 2
+	}
+}
+
+func runPluginMarketplaceListCLI(state *bootstrap.State, args []string, stdout io.Writer, stderr io.Writer) int {
+	flags := flag.NewFlagSet("claude plugin marketplace list", flag.ContinueOnError)
+	flags.SetOutput(stderr)
+	jsonOutput := flags.Bool("json", false, "output JSON")
+	if err := flags.Parse(args); err != nil {
+		if err == flag.ErrHelp {
+			return 0
+		}
+		return 2
+	}
+	if flags.NArg() > 0 {
+		fmt.Fprintf(stderr, "ccgo plugin marketplace list: unexpected argument %s\n", flags.Arg(0))
+		return 2
+	}
+	runner, err := state.ConversationRunner()
+	if err != nil {
+		fmt.Fprintf(stderr, "ccgo plugin marketplace list: %v\n", err)
+		return 1
+	}
+	marketplaces := pluginCLIMarketplaceEntries(runnerMergedSettings(runner))
+	if *jsonOutput {
+		encoder := json.NewEncoder(stdout)
+		encoder.SetIndent("", "  ")
+		if err := encoder.Encode(marketplaces); err != nil {
+			fmt.Fprintf(stderr, "ccgo plugin marketplace list: %v\n", err)
+			return 1
+		}
+		return 0
+	}
+	if len(marketplaces) == 0 {
+		fmt.Fprintln(stdout, "No marketplaces configured")
+		return 0
+	}
+	fmt.Fprintln(stdout, "Configured marketplaces:")
+	for _, marketplace := range marketplaces {
+		fmt.Fprintf(stdout, "- %s\n", marketplace.Name)
+		if source := pluginCLIMarketplaceSourceText(marketplace); source != "" {
+			fmt.Fprintf(stdout, "  Source: %s\n", source)
+		}
+		if marketplace.InstallLocation != "" {
+			fmt.Fprintf(stdout, "  Install location: %s\n", marketplace.InstallLocation)
+		}
+	}
+	return 0
+}
+
 func pluginCLIInstalledEntries(plugins []pluginpkg.LoadedPlugin, settings contracts.Settings) []pluginCLIListEntry {
 	out := make([]pluginCLIListEntry, 0, len(plugins))
 	for _, plugin := range plugins {
@@ -444,6 +516,81 @@ func pluginCLIAvailableEntries(marketplacePlugins []pluginpkg.LoadedPlugin, inst
 	return out
 }
 
+func pluginCLIMarketplaceEntries(settings contracts.Settings) []pluginCLIMarketplaceEntry {
+	names := make([]string, 0, len(settings.ExtraKnownMarketplaces))
+	for name := range settings.ExtraKnownMarketplaces {
+		if strings.TrimSpace(name) != "" {
+			names = append(names, strings.TrimSpace(name))
+		}
+	}
+	sort.Strings(names)
+	out := make([]pluginCLIMarketplaceEntry, 0, len(names))
+	for _, name := range names {
+		rawEntry, _ := settings.ExtraKnownMarketplaces[name].(map[string]any)
+		source := pluginCLIMarketplaceSource(rawEntry)
+		sourceType := strings.TrimSpace(pluginCLIStringFromMap(source, "source"))
+		entry := pluginCLIMarketplaceEntry{
+			Name:            name,
+			Source:          sourceType,
+			InstallLocation: strings.TrimSpace(pluginCLIStringFromMap(rawEntry, "installLocation")),
+		}
+		switch sourceType {
+		case "github":
+			entry.Repo = pluginCLIStringFromMap(source, "repo")
+		case "git", "url":
+			entry.URL = pluginCLIStringFromMap(source, "url")
+		case "directory", "file":
+			entry.Path = pluginCLIStringFromMap(source, "path")
+		case "npm":
+			entry.Package = pluginCLIStringFromMap(source, "package")
+		}
+		out = append(out, entry)
+	}
+	return out
+}
+
+func pluginCLIMarketplaceSource(rawEntry map[string]any) map[string]any {
+	if len(rawEntry) == 0 {
+		return nil
+	}
+	if source, ok := rawEntry["source"].(map[string]any); ok {
+		return source
+	}
+	return rawEntry
+}
+
+func pluginCLIMarketplaceSourceText(marketplace pluginCLIMarketplaceEntry) string {
+	switch marketplace.Source {
+	case "github":
+		if marketplace.Repo != "" {
+			return "GitHub (" + marketplace.Repo + ")"
+		}
+	case "git":
+		if marketplace.URL != "" {
+			return "Git (" + marketplace.URL + ")"
+		}
+	case "url":
+		if marketplace.URL != "" {
+			return "URL (" + marketplace.URL + ")"
+		}
+	case "directory":
+		if marketplace.Path != "" {
+			return "Directory (" + marketplace.Path + ")"
+		}
+	case "file":
+		if marketplace.Path != "" {
+			return "File (" + marketplace.Path + ")"
+		}
+	case "npm":
+		if marketplace.Package != "" {
+			return "NPM (" + marketplace.Package + ")"
+		}
+	case "settings":
+		return "Settings"
+	}
+	return strings.TrimSpace(marketplace.Source)
+}
+
 func pluginCLIID(plugin pluginpkg.LoadedPlugin) string {
 	name := strings.TrimSpace(plugin.Name)
 	if name == "" {
@@ -467,6 +614,14 @@ func pluginCLINameKey(name string) string {
 	return strings.ToLower(strings.TrimSpace(name))
 }
 
+func pluginCLIStringFromMap(values map[string]any, key string) string {
+	if len(values) == 0 {
+		return ""
+	}
+	value, _ := values[key].(string)
+	return strings.TrimSpace(value)
+}
+
 func pluginCLIMCPServerNames(servers map[string]contracts.MCPServer) []string {
 	names := make([]string, 0, len(servers))
 	for name := range servers {

cmd/claude/main_test.go

@@ -2149,6 +2149,113 @@ func TestRunPluginListJSONAvailable(t *testing.T) {
 	}
 }
 
+func TestRunPluginMarketplaceListCLI(t *testing.T) {
+	configHome := t.TempDir()
+	t.Setenv("CLAUDE_CONFIG_DIR", configHome)
+	project := t.TempDir()
+	if err := os.MkdirAll(filepath.Join(project, ".git"), 0o755); err != nil {
+		t.Fatal(err)
+	}
+	directoryMarket := filepath.Join(t.TempDir(), "team-market")
+	fileMarket := filepath.Join(t.TempDir(), "catalog.json")
+	settings := fmt.Sprintf(`{
+		"extraKnownMarketplaces": {
+			"team": {
+				"source": {"source": "directory", "path": %q},
+				"installLocation": "project"
+			},
+			"remote": {"source": {"source": "url", "url": "https://example.com/catalog.json"}},
+			"github": {"source": {"source": "github", "repo": "owner/repo"}},
+			"npm-tools": {"source": {"source": "npm", "package": "@example/tools"}},
+			"file": {"source": {"source": "file", "path": %q}}
+		}
+	}`, directoryMarket, fileMarket)
+	if err := os.WriteFile(filepath.Join(configHome, "settings.json"), []byte(settings), 0o644); err != nil {
+		t.Fatal(err)
+	}
+
+	var stdout, stderr bytes.Buffer
+	code := run([]string{"--cwd", project, "plugin", "marketplace", "list", "--json"}, strings.NewReader(""), &stdout, &stderr)
+	if code != 0 {
+		t.Fatalf("exit = %d stderr=%s", code, stderr.String())
+	}
+	var payload []map[string]any
+	if err := json.Unmarshal(stdout.Bytes(), &payload); err != nil {
+		t.Fatalf("invalid json stdout %q: %v", stdout.String(), err)
+	}
+	if len(payload) != 5 {
+		t.Fatalf("marketplaces = %#v", payload)
+	}
+	byName := map[string]map[string]any{}
+	for _, marketplace := range payload {
+		name, _ := marketplace["name"].(string)
+		byName[name] = marketplace
+	}
+	if byName["team"]["source"] != "directory" || byName["team"]["path"] != directoryMarket || byName["team"]["installLocation"] != "project" {
+		t.Fatalf("team marketplace = %#v", byName["team"])
+	}
+	if byName["remote"]["source"] != "url" || byName["remote"]["url"] != "https://example.com/catalog.json" {
+		t.Fatalf("remote marketplace = %#v", byName["remote"])
+	}
+	if byName["github"]["source"] != "github" || byName["github"]["repo"] != "owner/repo" {
+		t.Fatalf("github marketplace = %#v", byName["github"])
+	}
+	if byName["npm-tools"]["source"] != "npm" || byName["npm-tools"]["package"] != "@example/tools" {
+		t.Fatalf("npm marketplace = %#v", byName["npm-tools"])
+	}
+	if byName["file"]["source"] != "file" || byName["file"]["path"] != fileMarket {
+		t.Fatalf("file marketplace = %#v", byName["file"])
+	}
+
+	stdout.Reset()
+	stderr.Reset()
+	code = run([]string{"--cwd", project, "plugin", "marketplace", "list"}, strings.NewReader(""), &stdout, &stderr)
+	if code != 0 {
+		t.Fatalf("text exit = %d stderr=%s", code, stderr.String())
+	}
+	for _, want := range []string{
+		"Configured marketplaces:",
+		"- team",
+		"Source: Directory (" + directoryMarket + ")",
+		"Install location: project",
+		"- remote",
+		"Source: URL (https://example.com/catalog.json)",
+		"- github",
+		"Source: GitHub (owner/repo)",
+		"- npm-tools",
+		"Source: NPM (@example/tools)",
+	} {
+		if !strings.Contains(stdout.String(), want) {
+			t.Fatalf("text output missing %q: %q", want, stdout.String())
+		}
+	}
+}
+
+func TestRunPluginMarketplaceListEmpty(t *testing.T) {
+	configHome := t.TempDir()
+	t.Setenv("CLAUDE_CONFIG_DIR", configHome)
+	project := t.TempDir()
+	if err := os.MkdirAll(filepath.Join(project, ".git"), 0o755); err != nil {
+		t.Fatal(err)
+	}
+
+	var stdout, stderr bytes.Buffer
+	code := run([]string{"--cwd", project, "plugin", "marketplace", "list"}, strings.NewReader(""), &stdout, &stderr)
+	if code != 0 {
+		t.Fatalf("exit = %d stderr=%s", code, stderr.String())
+	}
+	if got := strings.TrimSpace(stdout.String()); got != "No marketplaces configured" {
+		t.Fatalf("stdout = %q", stdout.String())
+	}
+
+	stdout.Reset()
+	stderr.Reset()
+	code = run([]string{"--cwd", project, "plugin", "marketplace", "refresh"}, strings.NewReader(""), &stdout, &stderr)
+	if code != 2 || !strings.Contains(stderr.String(), "unsupported subcommand refresh") {
+		t.Fatalf("unsupported exit=%d stdout=%q stderr=%q", code, stdout.String(), stderr.String())
+	}
+}
+
 func TestRunPrintStreamJSONIncludesToolProgress(t *testing.T) {
 	var requestBody map[string]any
 	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {

docs/cc-100-roadmap.md

@@ -37,6 +37,8 @@ M4 补充：tool executor 会围绕 `PreToolUse`、`PostToolUse`、`PermissionDe
 
 M10 补充：plugin command/agent 的 allowed tool frontmatter 解析现在只在顶层逗号或空白处分隔，保留括号、方括号和引号内的逗号/空白，避免 `Bash(git commit -m "x,y")` 这类 tool pattern 被误拆。
 
+M8 补充：CLI `plugin marketplace list` 现在可列出 settings 中已配置的 marketplace；`--json` 输出按名称排序的 source/repo/url/path/package/installLocation 结构，普通文本输出与无配置提示也已覆盖。
+
 M10 补充：新增 `TaskOutput`/`AgentOutputTool` 和 `KillTask`/`TaskStop` 内置工具；`TaskOutput` 可列出当前 session 的 sidechain task，或按 task/sidechain ID 读取状态、summary、tail 输出和 agent metadata，`KillTask` 会通过 sidechain manager 写入 cancelled lifecycle summary。完整 AgentTool 执行循环、progress event streaming、resume command UI 和 worktree isolation 仍未完成。
 
 M10 补充：新增 `ResumeTask`/`TaskResume` 只读工具，复用 sidechain resume context builder 返回 `can_resume`、截断状态、message limit、agent metadata 和恢复用 tail message 摘要；plugin agent prompt 被 tail 截断时会自动以前置 system meta message 恢复。完整恢复后的 agent 执行循环和 UI picker 仍未完成。

docs/claude-code-go-rewrite-plan.md

@@ -143,7 +143,7 @@ test/parity/                 # golden tests against TS/official behavior
 - 本轮补充：`strictPluginOnlyCustomization` 已开始按 policy settings 生效，当前覆盖已实现的 `skills`、`mcp`、`hooks` 和 agent-metadata surfaces：锁定后 user/project/local skills 与 legacy commands 不加载，manual MCP server sources 不加载但 plugin/admin policy 仍保留，settings hooks 只保留 policy hooks 且 plugin hooks 继续运行；`agents` 锁定时非 plugin/bundled/admin prompt command 的 `agent`、`context: fork` 和 `effort` frontmatter metadata 会被清除。完整 forked agent runtime/UI edge cases 仍按缺口追踪。
 - 本轮补充：settings 文件读取现在有 path-keyed cache，按 size/mode/mtime 指纹复用内容并提供 `ResetSettingsCache`；新增 settings change detector，可对 settings 文件快照区分 created/modified/deleted，并在检测到变化时清空 settings 文件缓存；Runner turn-start 会在检测到 user/project/local settings 文件变化时重载 merged settings 并同步刷新 plugin MCP server app-state。完整后台 watcher 和 remote managed 非 daemon 后台 refresh 生命周期仍按缺口追踪。
 - 本轮补充：新增 settings JSON Schema generation，`SettingsJSONSchema()` 会从 `contracts.Settings` 反射生成 draft 2020-12 schema，补强 `$schema` const、permission mode enum、`strictPluginOnlyCustomization` union 和 login method enum；`/config show schema` 现在可展示 schema ID、draft、字段数和生成大小，完整 Zod message parity 仍按缺口追踪。
-- 本轮补充：settings validation 现在覆盖官方 marketplace source union 的基础语义，适用于 `extraKnownMarketplaces[].source`、`strictKnownMarketplaces[]` 和 `blockedMarketplaces[]`：校验 source discriminator、各 source 类型必填字段、URL source 绝对 URL、headers string record、github/git sparsePaths string array、settings-source plugins array/item path shape、settings-source name 安全/保留名，并继续覆盖 inline marketplace key/name 一致性；`internal/plugins` 新增 marketplace policy resolver，blocked settings 优先、strict allowlist 非空时拒绝未列入来源，`/plugin marketplaces` 会展示 allow/block decision；本地 plugin manifest 可声明 `marketplace`/`marketplaceName`/`marketplace_name`/`source.name`，带 settings 的 plugin loader 会对这些来源执行 marketplace policy，`extraKnownMarketplaces.<name>.source.source=settings` 的 `plugins` 本地 root、`source=directory` 的本地 marketplace 目录、`source=file` catalog、`source=url` 远端 JSON catalog、`source=git` clone cache、`source=github` repo clone cache 以及 `source=npm` package cache 的 plugin roots 都会进入 plugin load path 并继承 marketplace 名称；URL catalog 支持配置 headers、大小限制、JSON 校验、写入 `marketplace-cache/catalogs` 并在后续请求失败时缓存回退；git/github source 会按 URL clone 到 `marketplace-cache/git`，后续加载 fetch/pull，支持 `ref` checkout 和 repo 内 `path` 指向单插件、插件目录或 catalog JSON，github `repo: owner/name` 会规范化为 GitHub clone URL；npm source 会用 `npm pack` 解包到 `marketplace-cache/npm`，失败时可从已有缓存回退，且支持 package 内 `path` 指向单插件、插件目录或 catalog JSON；`/plugin show/search` 会标注 blocked reason；headless `/plugin available [query]`、`/plugin marketplace plugins|search|show` 会浏览 configured marketplace 插件并标注 available/installed/update 状态；CLI `plugin list --json --available` 会输出 installed/available marketplace JSON；headless `/plugin install <name>` 会从这些已配置 marketplace 来源复制插件到项目 `.claude/plugins/<safe-name>`，不覆盖冲突路径，并刷新 plugin MCP server app-state；headless `/plugin update [name]` 会刷新配置的 marketplace cache，并把已安装的同名插件替换为最新 marketplace 副本后刷新 plugin MCP server app-state。完整 marketplace TUI/UI、后台自动更新和策略 lifecycle 仍按缺口追踪。
+- 本轮补充：settings validation 现在覆盖官方 marketplace source union 的基础语义，适用于 `extraKnownMarketplaces[].source`、`strictKnownMarketplaces[]` 和 `blockedMarketplaces[]`：校验 source discriminator、各 source 类型必填字段、URL source 绝对 URL、headers string record、github/git sparsePaths string array、settings-source plugins array/item path shape、settings-source name 安全/保留名，并继续覆盖 inline marketplace key/name 一致性；`internal/plugins` 新增 marketplace policy resolver，blocked settings 优先、strict allowlist 非空时拒绝未列入来源，`/plugin marketplaces` 会展示 allow/block decision；本地 plugin manifest 可声明 `marketplace`/`marketplaceName`/`marketplace_name`/`source.name`，带 settings 的 plugin loader 会对这些来源执行 marketplace policy，`extraKnownMarketplaces.<name>.source.source=settings` 的 `plugins` 本地 root、`source=directory` 的本地 marketplace 目录、`source=file` catalog、`source=url` 远端 JSON catalog、`source=git` clone cache、`source=github` repo clone cache 以及 `source=npm` package cache 的 plugin roots 都会进入 plugin load path 并继承 marketplace 名称；URL catalog 支持配置 headers、大小限制、JSON 校验、写入 `marketplace-cache/catalogs` 并在后续请求失败时缓存回退；git/github source 会按 URL clone 到 `marketplace-cache/git`，后续加载 fetch/pull，支持 `ref` checkout 和 repo 内 `path` 指向单插件、插件目录或 catalog JSON，github `repo: owner/name` 会规范化为 GitHub clone URL；npm source 会用 `npm pack` 解包到 `marketplace-cache/npm`，失败时可从已有缓存回退，且支持 package 内 `path` 指向单插件、插件目录或 catalog JSON；`/plugin show/search` 会标注 blocked reason；headless `/plugin available [query]`、`/plugin marketplace plugins|search|show` 会浏览 configured marketplace 插件并标注 available/installed/update 状态；CLI `plugin list --json --available` 会输出 installed/available marketplace JSON，CLI `plugin marketplace list --json` 会列出已配置 marketplace 的 source/repo/url/path/package/installLocation 投影；headless `/plugin install <name>` 会从这些已配置 marketplace 来源复制插件到项目 `.claude/plugins/<safe-name>`，不覆盖冲突路径，并刷新 plugin MCP server app-state；headless `/plugin update [name]` 会刷新配置的 marketplace cache，并把已安装的同名插件替换为最新 marketplace 副本后刷新 plugin MCP server app-state。完整 marketplace TUI/UI、后台自动更新和策略 lifecycle 仍按缺口追踪。
 
 ### M4: Tool framework、permissions、sandbox