graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs
Python
Merge MCP configuration listing for v0.302.40
justrachbce6cf133066
diff --cc src/mcp.zigindex 6428fe77,87937304..3ce80195--- a/src/mcp.zig+++ b/src/mcp.zig@@@ -455,11 -474,5 +455,12 @@@ test_ = @import("mcp_cache.zig");_ = @import("mcp_boot.zig");_ = @import("mcp_elicitation.zig");+ _ = @import("mcp_start.zig");+ _ = @import("mcp_state.zig");+ _ = @import("mcp_status.zig");+ _ = @import("mcp_status_cli.zig");+ _ = @import("mcp_reconnect.zig");+ _ = @import("mcp_listing.zig");+ _ = @import("mcp_failures.zig");+ _ = @import("mcp_list_json.zig");}diff --cc src/mcp_cli.zigindex 2d4a21e4,c6225f7c..7caea06e--- a/src/mcp_cli.zig+++ b/src/mcp_cli.zig@@@ -329,13 -326,13 +330,18 @@@ pub fn mcpCommand(io: Io, gpa: Allocatoreturn;}+ if (args.len > 0) if (@import("mcp_status_cli.zig").verb(args[0])) {+ const merged = mcp_config.load(io, arena, Io.Dir.cwd(), mcp_config_path, global_path, home, mcp_config.isEnvOverride(environ_map));+ return @import("mcp_status_cli.zig").run(io, gpa, arena, home, merged, args, &out.interface, environ_map);+ };+if (args.len == 0 or std.mem.eql(u8, args[0], "list")) {const merged = mcp_config.load(io, arena, Io.Dir.cwd(), mcp_config_path, global_path, home, mcp_config.isEnvOverride(environ_map));+ if (args.len > 1 and std.mem.eql(u8, args[1], "--json")) {+ try @import("mcp_list_json.zig").write(arena, merged, mcp_config_path, global_path, &out.interface);+ try out.interface.flush();+ return;+ }try mcp_config.reportInvalid(merged, &out.interface, mcp_config_path, global_path, "", "");if (merged.servers.count() == 0) {try out.interface.writeAll("no MCP servers configured. Add one with `graff mcp add <name> -- <command> [args...]`,\nor list servers for every project in ~/" ++ mcp_config.global_rel_path ++ ".\n");diff --cc src/mcp_config.zigindex 2c810907,7902f39f..2eb15825--- a/src/mcp_config.zig+++ b/src/mcp_config.zig@@@ -133,9 -179,10 +182,11 @@@ pub fn load(io: Io, arena: Allocator, d// as "no config" and then pick up a project file on a later read.if (global_is_override and merged.found and !merged.invalid_global and global.count() == 0)return merged;+ merged.global = global;- merged.project = readServers(io, arena, dir, project_path, &merged.found, &merged.invalid_project);+ const project_tables = readServers(io, arena, dir, project_path, &merged.found, &merged.invalid_project);+ merged.project = project_tables.servers;+ merged.project_off = project_tables.off;// Global first, project second: the later `put` for a name overwrites, so// the workspace keeps the final say over its own tooling.