mirror of
https://github.com/runkids/skillshare.git
synced 2026-11-20 20:34:19 +00:00
feat(mcp): default new Pi servers to the built-in MCP
`mcp add --target pi` without `--pi-extension` failed at render time with "Pi requires piExtension", so scripts had to know about Pi's modes before they could add anything. The maintainer decided new servers that reach Pi should use Pi's built-in MCP (Pi >= 0.99.0) when no mode was chosen. `mcp add` and `mcp import` now store `piExtension: builtin` at creation time when the server's own or inherited targets include Pi or a Pi account. The mode of other servers is not consulted, stored values are never rewritten, and switch-only entries keep inheriting the global server's mode. renderPi still refuses an entry without a mode, so a hand-written config stays explicit. Integration tests prove the built-in file follows the scope: ~/.pi/agent/mcp.json globally, <root>/.pi/mcp.json in project mode and for a server under mcp.projects.
This commit is contained in:
@@ -335,7 +335,7 @@ Commands:
|
||||
restore [id] Browse backups, preview and restore Agent entries
|
||||
|
||||
Options:
|
||||
--pi-extension <mode> builtin (Pi >= 0.99.0), pi-mcp-adapter or pi-mcp-extension
|
||||
--pi-extension <mode> builtin (Pi >= 0.99.0; default for a new server), pi-mcp-adapter or pi-mcp-extension
|
||||
--direct-tools <value> pi-mcp-adapter only: true, false, search, or tool names separated by commas
|
||||
--pi-options <json> builtin or adapter: other per-server fields as a JSON object
|
||||
--pi-options-prune Remove cleared Pi fields only if owned and unchanged (=false disables)
|
||||
|
||||
@@ -32,6 +32,10 @@ func runMCPAdd(service *mcp.Service, o mcpOptions) error {
|
||||
if _, exists := source.Servers[o.name]; exists && !o.replace {
|
||||
return fmt.Errorf("MCP %s already exists; use --replace to explicitly replace its source definition", o.name)
|
||||
}
|
||||
// A switch-only entry takes the mode of the server it turns off.
|
||||
if !server.Disabled {
|
||||
source.DefaultPiExtension(&server)
|
||||
}
|
||||
return finishMCPMutation(service, mcp.Mutation{Name: o.name, Server: &server}, o, time.Now())
|
||||
}
|
||||
|
||||
@@ -146,6 +150,7 @@ func runMCPImport(service *mcp.Service, o mcpOptions) error {
|
||||
if o.piExtension != "" {
|
||||
c.Server.PiExtension = o.piExtension
|
||||
}
|
||||
source.DefaultPiExtension(&c.Server)
|
||||
selectedTargets := c.Server.Targets
|
||||
if selectedTargets == nil {
|
||||
selectedTargets = source.Targets
|
||||
|
||||
@@ -144,6 +144,54 @@ func TestMCPImportFromOtherAgentCanChoosePiMode(t *testing.T) {
|
||||
}
|
||||
}
|
||||
|
||||
func TestMCPAddDefaultsPiToBuiltin(t *testing.T) {
|
||||
for _, tc := range []struct {
|
||||
name, want string
|
||||
args []string
|
||||
}{
|
||||
{"explicit target", "builtin", []string{"--target", "pi"}},
|
||||
{"inherited target", "builtin", nil},
|
||||
{"chosen mode kept", "pi-mcp-adapter", []string{"--target", "pi", "--pi-extension", "pi-mcp-adapter"}},
|
||||
{"no Pi", "", []string{"--target", "claude"}},
|
||||
} {
|
||||
t.Run(tc.name, func(t *testing.T) {
|
||||
s := mcpTUIService(t)
|
||||
if err := os.WriteFile(s.ConfigPath, []byte("mcp: {targets: [pi], servers: {}}\n"), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
o, err := parseMCPOptions(append([]string{"docs", "--url", "https://example.com/mcp", "--no-tui"}, tc.args...))
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = runMCPAdd(s, o); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
source, err := mcp.LoadSource(s.ConfigPath)
|
||||
if err != nil || source.Servers["docs"].PiExtension != tc.want {
|
||||
t.Fatalf("%+v %v", source.Servers["docs"], err)
|
||||
}
|
||||
})
|
||||
}
|
||||
}
|
||||
|
||||
func TestMCPImportIntoPiDefaultsToBuiltin(t *testing.T) {
|
||||
s := mcpTUIService(t)
|
||||
if err := os.WriteFile(filepath.Join(s.Home, ".claude.json"), []byte(`{"mcpServers":{"docs":{"command":"docs"}}}`), 0600); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
o, err := parseMCPOptions([]string{"docs", "--from", "claude", "--target", "pi", "--no-tui"})
|
||||
if err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
if err = runMCPImport(s, o); err != nil {
|
||||
t.Fatal(err)
|
||||
}
|
||||
source, err := mcp.LoadSource(s.ConfigPath)
|
||||
if err != nil || source.Servers["docs"].PiExtension != "builtin" {
|
||||
t.Fatalf("%+v %v", source.Servers["docs"], err)
|
||||
}
|
||||
}
|
||||
|
||||
func TestMCPPiCLI(t *testing.T) {
|
||||
s := mcpTUIService(t)
|
||||
o, err := parseMCPOptions([]string{"docs", "--target", "pi", "--pi-extension", "pi-mcp-extension", "--url", "https://example.com/mcp", "--no-tui"})
|
||||
|
||||
@@ -96,6 +96,24 @@ func agentFieldsChanged(target string, current, want map[string]any) bool {
|
||||
return false
|
||||
}
|
||||
|
||||
// DefaultPiExtension gives a new server that reaches Pi, or an account of Pi, the built-in
|
||||
// mode when none was chosen. Other servers' modes are not consulted.
|
||||
func (s *Source) DefaultPiExtension(server *Server) {
|
||||
if server.PiExtension != "" {
|
||||
return
|
||||
}
|
||||
targets := server.Targets
|
||||
if targets == nil {
|
||||
targets = s.Targets
|
||||
}
|
||||
for _, target := range targets {
|
||||
if target == "pi" || s.Accounts[target].Agent == "pi" {
|
||||
server.PiExtension = "builtin"
|
||||
return
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Pi's extensions differ in file, transport and credential syntax.
|
||||
// Sync config only: installing or starting either extension remains explicit.
|
||||
func renderPi(s Server) (map[string]any, error) {
|
||||
|
||||
@@ -32,3 +32,50 @@ func TestMCPPiBuiltinLifecycle(t *testing.T) {
|
||||
t.Fatal("managed entry remained")
|
||||
}
|
||||
}
|
||||
|
||||
// A server added for Pi without a mode is built-in, written to the file of its scope.
|
||||
func TestMCPPiBuiltinDefaultFollowsScope(t *testing.T) {
|
||||
t.Run("global", func(t *testing.T) {
|
||||
sb := testutil.NewSandbox(t)
|
||||
defer sb.Cleanup()
|
||||
sb.WriteConfig("targets: {}\n")
|
||||
sb.RunCLI("mcp", "add", "docs", "--target", "pi", "--url", "https://example.com/mcp", "--no-tui", "-g").AssertSuccess(t)
|
||||
if !strings.Contains(sb.ReadFile(sb.ConfigPath), "piExtension: builtin") {
|
||||
t.Fatal(sb.ReadFile(sb.ConfigPath))
|
||||
}
|
||||
sb.RunCLI("sync", "mcp", "-g").AssertSuccess(t)
|
||||
if !strings.Contains(sb.ReadFile(filepath.Join(sb.Home, ".pi", "agent", "mcp.json")), `"docs"`) {
|
||||
t.Fatal("global Pi file lacks docs")
|
||||
}
|
||||
})
|
||||
t.Run("project mode", func(t *testing.T) {
|
||||
sb := testutil.NewSandbox(t)
|
||||
defer sb.Cleanup()
|
||||
sb.WriteConfig("targets: {}\n")
|
||||
root := sb.SetupProjectDir()
|
||||
sb.RunCLIInDir(root, "mcp", "add", "docs", "--target", "pi", "--url", "https://example.com/mcp", "--no-tui", "-p").AssertSuccess(t)
|
||||
if !strings.Contains(sb.ReadFile(filepath.Join(root, ".skillshare", "config.yaml")), "piExtension: builtin") {
|
||||
t.Fatal(sb.ReadFile(filepath.Join(root, ".skillshare", "config.yaml")))
|
||||
}
|
||||
sb.RunCLIInDir(root, "sync", "mcp", "-p").AssertSuccess(t)
|
||||
if !strings.Contains(sb.ReadFile(filepath.Join(root, ".pi", "mcp.json")), `"docs"`) {
|
||||
t.Fatal("project Pi file lacks docs")
|
||||
}
|
||||
if sb.FileExists(filepath.Join(sb.Home, ".pi", "agent", "mcp.json")) {
|
||||
t.Fatal("project server reached the global Pi file")
|
||||
}
|
||||
})
|
||||
t.Run("mcp.projects", func(t *testing.T) {
|
||||
sb := testutil.NewSandbox(t)
|
||||
defer sb.Cleanup()
|
||||
root := filepath.Join(sb.Root, "work")
|
||||
sb.WriteConfig("targets: {}\nmcp:\n projects:\n " + root + ":\n servers:\n docs:\n url: https://example.com/mcp\n targets: [pi]\n piExtension: builtin\n")
|
||||
sb.RunCLI("sync", "mcp", "-g").AssertSuccess(t)
|
||||
if !strings.Contains(sb.ReadFile(filepath.Join(root, ".pi", "mcp.json")), `"docs"`) {
|
||||
t.Fatal("mcp.projects Pi file lacks docs")
|
||||
}
|
||||
if sb.FileExists(filepath.Join(sb.Home, ".pi", "agent", "mcp.json")) {
|
||||
t.Fatal("project server reached the global Pi file")
|
||||
}
|
||||
})
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user