Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
9 changes: 6 additions & 3 deletions internal/aisettings/claudemem.go
Original file line number Diff line number Diff line change
Expand Up @@ -944,12 +944,15 @@ func ensureMCPEntry(path, dotPath string, variant mcpEntryVariant) (bool, error)

func ensureScopedMCPEntry(path, dotPath string, variant mcpEntryVariant, home, pluginRoot string) (bool, error) {
doc := map[string]json.RawMessage{}
if raw, err := os.ReadFile(path); err == nil {
raw, err := os.ReadFile(path)
if err != nil && !os.IsNotExist(err) {
return false, err
}
// agy ships its MCP config as an empty file; treat that as no servers.
if len(bytes.TrimSpace(raw)) > 0 {
if err := json.Unmarshal(raw, &doc); err != nil {
return false, fmt.Errorf("parse MCP config %s: %w", path, err)
}
} else if !os.IsNotExist(err) {
return false, err
}
servers := map[string]json.RawMessage{}
if raw := doc["mcpServers"]; len(raw) > 0 {
Expand Down
17 changes: 17 additions & 0 deletions internal/aisettings/claudemem_selection_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -204,3 +204,20 @@ func TestSelectedAntigravityGetsMCPRecall(t *testing.T) {
t.Fatal("unselected qwen was wired")
}
}

// agy creates mcp_config.json as an empty file; the entry still lands, while
// a non-empty broken file is still rejected.
func TestMCPEntryAcceptsEmptyConfigFile(t *testing.T) {
path := filepath.Join(t.TempDir(), "mcp_config.json")
mustWriteFile(t, path, "")
if _, err := ensureMCPEntry(path, "/opt/bin/dot", mcpVariantStandard); err != nil {
t.Fatal(err)
}
if !hasManagedMCPEntry(path, "/opt/bin/dot") {
t.Fatal("entry missing after empty config")
}
mustWriteFile(t, path, "{broken")
if _, err := ensureMCPEntry(path, "/opt/bin/dot", mcpVariantStandard); err == nil {
t.Fatal("broken config accepted")
}
}
Loading