Skip to content

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

Python

additional_tools: a child keeps the tools the root loaded

justrachc5ad1b97bf23
diff --git a/src/additional_tools_tests.zig b/src/additional_tools_tests.zig
index 829dab39..9c099a52 100644
--- a/src/additional_tools_tests.zig
+++ b/src/additional_tools_tests.zig
@@ -312,3 +312,27 @@ test "Codex and the OpenAI API: a tool load leaves tools byte-identical and adds
try std.testing.expect(std.mem.indexOf(u8, toolsOf(after), "\"defer_loading\":true") != null);
}
}
+
+test "a child keeps the tools the root loaded; only the root's request strips them" {
+ var arena_state = std.heap.ArenaAllocator.init(std.testing.allocator);
+ defer arena_state.deinit();
+ const a = arena_state.allocator();
+ const saved_fold = native_fold.enabled;
+ const saved_stable = mcp_schema_gate.g_stable_catalog;
+ defer {
+ native_fold.enabled = saved_fold;
+ mcp_schema_gate.g_stable_catalog = saved_stable;
+ native_fold.clearLoadedSession();
+ }
+ native_fold.enabled = true;
+ mcp_schema_gate.g_stable_catalog = true;
+ native_fold.clearLoadedSession();
+ // webfetch is folded on the root and part of every child's own catalog.
+ native_fold.markLoaded("webfetch");
+ var child = try testAgentFor(a, "codex", .responses, "gpt-6.1-sol");
+ child.sub = true;
+ try std.testing.expect(additional_tools.active(child.provider));
+ const body = try child.buildBody(child.toolsJson(), false, true, true);
+ defer std.testing.allocator.free(body);
+ try std.testing.expect(std.mem.indexOf(u8, toolsOf(body), "\"name\":\"webfetch\"") != null);
+}
diff --git a/src/agent_request_body.zig b/src/agent_request_body.zig
index 1218b1d6..1923e7c4 100644
--- a/src/agent_request_body.zig
+++ b/src/agent_request_body.zig
@@ -151,7 +151,7 @@ pub fn buildBody(self: *Agent, tools_in: ?[]const u8, force_tool: bool, stream:
const at = @import("additional_tools.zig");
try s.objectField("tools");
// #261 follow-up: the rest need the root-schema repair too.
- try @import("tool_call_repair.zig").writeChatTools(&s, self.scratchAlloc(), if (at.active(self.provider)) at.stripTail(self, self.scratchAlloc(), t) else t, self.provider.id, self.provider.model);
+ try @import("tool_call_repair.zig").writeChatTools(&s, self.scratchAlloc(), if (at.active(self.provider) and !self.sub) at.stripTail(self, self.scratchAlloc(), t) else t, self.provider.id, self.provider.model);
if (force_tool or @import("meta_wire.zig").restricted(self.provider.id, self.provider.model)) {
try s.objectField("tool_choice"); // #751: Meta is auto-only
try s.write(@import("meta_wire.zig").toolChoice(force_tool, self.provider.id, self.provider.model));
diff --git a/src/agent_request_body_responses.zig b/src/agent_request_body_responses.zig
index 6251ef17..ae406260 100644
--- a/src/agent_request_body_responses.zig
+++ b/src/agent_request_body_responses.zig
@@ -64,7 +64,9 @@ pub fn write(self: *Agent, s: *std.json.Stringify, tools: ?[]const u8, force_too
// ADR 0221: loaded tools ride additional_tools items here, so the tail
// never reaches `tools`. Strip it before the hosted splices below: a
// hosted tool_search with nothing deferred left is a 400 (#746).
- var next = if (additional_tools.active(self.provider)) additional_tools.stripTail(self, self.scratchAlloc(), t) else t;
+ // Only the root: a child gets no announcement (additional_tools.sync),
+ // so its own catalog must keep every tool it lists.
+ var next = if (additional_tools.active(self.provider) and !self.sub) additional_tools.stripTail(self, self.scratchAlloc(), t) else t;
if (xai_hosted.active(self.provider.id, self.provider.kind)) {
const login = self.provider.source == .login;
next = xai_hosted.splice(self.scratchAlloc(), next, login) catch next;
diff --git a/src/codex_chain.zig b/src/codex_chain.zig
index 9a4db601..c14f3670 100644
--- a/src/codex_chain.zig
+++ b/src/codex_chain.zig
@@ -41,7 +41,7 @@ pub fn propsFor(self: *const Agent) u64 {
fn wireTools(self: *const Agent, arena: std.mem.Allocator) []const u8 {
const additional_tools = @import("additional_tools.zig");
const tools = self.toolsJson();
- if (!additional_tools.active(self.provider)) return tools;
+ if (self.sub or !additional_tools.active(self.provider)) return tools;
return additional_tools.stripTail(self, arena, tools);
}