Skip to content

graff — a fast agentic coding harness in Zig: multi-provider, MCP, workflows, DGM evolution loop, TS/Python SDKs

Python

Apply GRAFF_NO_PLUGINS before connecting MCP servers

Rach Pradhandae3b5dff5ff
diff --git a/src/session_start.zig b/src/session_start.zig
index 32e177fd..becb047d 100644
--- a/src/session_start.zig
+++ b/src/session_start.zig
@@ -439,6 +439,10 @@ pub fn leanMode(effective_lean: bool, environ_map: anytype) bool {
}
pub fn initRegistryConsent(io: Io, gpa: Allocator, arena: Allocator, out: *Io.Writer, in: *Io.Reader, flags: args.Flags, mcp_config_path: []const u8, home: []const u8, use_color: bool, json_mode: bool, environ_map: anytype) !mcp.Registry {
+ // GRAFF_NO_PLUGINS must hold before the merge below reads Claude/Cursor/
+ // Grok/Codex MCP trees. applyEnvKnobs sets it too, but only after the
+ // registry has already connected their servers.
+ @import("plugins.zig").applyEnv(environ_map);
const global_path = mcp_config.globalPath(arena, home, environ_map);
const sink = engine_sink.writerSink(out);
// First interactive session copies Claude/Cursor MCP into ~/.codegraff once.
diff --git a/src/session_start_plugins_test.zig b/src/session_start_plugins_test.zig
new file mode 100644
index 00000000..9cb42ff2
--- /dev/null
+++ b/src/session_start_plugins_test.zig
@@ -0,0 +1,36 @@
+//! session_start.initRegistryConsent and the plugins switch, kept apart from
+//! session_start.zig (600-line ceiling).
+const std = @import("std");
+const Io = std.Io;
+const session_start = @import("session_start.zig");
+
+test "initRegistryConsent applies GRAFF_NO_PLUGINS before it reads any MCP config" {
+ const plugins = @import("plugins.zig");
+ const saved = plugins.disabled;
+ defer plugins.disabled = saved;
+ plugins.disabled = false;
+ var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena_state.deinit();
+ const arena = arena_state.allocator();
+ var tmp = std.testing.tmpDir(.{});
+ defer tmp.cleanup();
+ // A home whose Claude config names a server: with plugins off it must not
+ // be merged, so there is nothing to connect.
+ try tmp.dir.writeFile(std.testing.io, .{ .sub_path = ".claude.json", .data = "{\"mcpServers\":{\"leak\":{\"command\":\"/nonexistent/leak-mcp\"}}}" });
+ var home_buf: [std.fs.max_path_bytes]u8 = undefined;
+ const home_len = try tmp.dir.realPath(std.testing.io, &home_buf);
+ const home = home_buf[0..home_len];
+ const Env = struct {
+ pub fn get(_: @This(), key: []const u8) ?[]const u8 {
+ return if (std.mem.eql(u8, key, "GRAFF_NO_PLUGINS")) "1" else null;
+ }
+ };
+ var out_buf: [4096]u8 = undefined;
+ var out: Io.Writer = .fixed(&out_buf);
+ var in: Io.Reader = .fixed("");
+ const project = try std.fs.path.join(arena, &.{ home, ".mcp.json" });
+ var registry = try session_start.initRegistryConsent(std.testing.io, std.testing.allocator, arena, &out, &in, .{ .yolo_flag = true }, project, home, false, true, Env{});
+ defer registry.deinit();
+ try std.testing.expect(plugins.disabled);
+ for (registry.servers) |server| try std.testing.expect(!std.mem.eql(u8, server.name, "leak"));
+}
diff --git a/src/test_hooks.zig b/src/test_hooks.zig
index c045f950..b692093c 100644
--- a/src/test_hooks.zig
+++ b/src/test_hooks.zig
@@ -348,6 +348,7 @@ test {
_ = @import("commands_experiment.zig");
_ = @import("acp_engine.zig");
_ = @import("acp_config.zig");
+ _ = @import("session_start_plugins_test.zig");
_ = @import("acp_mcp_servers.zig");
_ = @import("libgraff.zig");
_ = @import("tui_peer.zig");