Compare commits

..

1 Commits

Author SHA1 Message Date
will.anderson 53fb75353f fix(chat): remove duplicate web_search tool in agentic_tools_all
Neuron Soul CI / build (pull_request) Failing after 5m24s
agentic_tools_literal() already contains a custom web_search tool.
agentic_tools_with_web() adds the Anthropic server-side web_search_20250305
tool (also named web_search). Combining them caused Anthropic to reject
every agentic request with 'Tool names must be unique.'

agentic_tools_all() now calls agentic_tools_literal() directly. Connector
tools splice in as before. The web_search-only variant (agentic_tools_with_web)
is unchanged for callers that specifically want native search without connectors.
2026-06-17 14:11:50 -05:00
+11 -80
View File
@@ -317,10 +317,13 @@ fn connector_tools_json() -> String {
return arr
}
// Built-in tools + native web_search + every connector tool, as one tools array.
// Splices connector tools in before the closing bracket of the base array.
// Built-in tools + every connector tool, as one tools array.
// Uses agentic_tools_literal (not agentic_tools_with_web) to avoid a duplicate
// "web_search" name the literal already includes a custom web_search handler,
// and adding the Anthropic server-side web_search_20250305 (same name) causes
// Anthropic to reject with "Tool names must be unique."
fn agentic_tools_all() -> String {
let base: String = agentic_tools_with_web()
let base: String = agentic_tools_literal()
let conn: String = connector_tools_json()
let conn_inner: String = str_slice(conn, 1, str_len(conn) - 1)
if str_eq(conn_inner, "") {
@@ -377,78 +380,16 @@ fn call_neuron_mcp(tool_name: String, args: String) -> String {
return json_safe(result)
}
// ---------------------------------------------------------------------------
// Agent workspace scope (defense-in-depth, NOT a hard security boundary).
//
// When a workspace root is configured (state key "agent_workspace_root", else
// env NEURON_AGENT_ROOT), the path-based tools (read_file, write_file,
// list_files, grep) are confined to that subtree by a lexical check, and
// run_command runs with its cwd set to the root. With no root set, behavior is
// unchanged (unscoped) for backward compatibility.
//
// LIMITATION FLAGGED FOR WILL'S REVIEW: this is a lexical guard. It does not
// resolve symlinks and cannot stop an arbitrary shell command from cd-ing out
// of the root. Real confinement needs runtime support (cwd-locked exec /
// sandbox-exec / chroot) in el_runtime.c. This raises the floor; it is not a
// boundary. The default-allow-when-unset policy and the "cd <root> && (...)"
// wrapping are deliberate choices to confirm against the intended design.
// ---------------------------------------------------------------------------
fn agent_workspace_root() -> String {
let s: String = state_get("agent_workspace_root")
if !str_eq(s, "") {
return s
}
return env("NEURON_AGENT_ROOT")
}
// Allow if path stays under root. Empty root = no sandbox = allow. Rejects
// parent traversal and ~ expansion; absolute paths must live under root.
fn path_within_root(path: String, root: String) -> Bool {
if str_eq(root, "") {
return true
}
if str_contains(path, "..") {
return false
}
if str_starts_with(path, "~") {
return false
}
if str_starts_with(path, "/") {
return str_starts_with(path, root)
}
return true
}
// Resolve a relative tool path against the root so it lands inside the subtree.
fn resolve_in_root(path: String, root: String) -> String {
if str_eq(root, "") {
return path
}
if str_starts_with(path, "/") {
return path
}
return root + "/" + path
}
fn dispatch_tool(tool_name: String, tool_input: String) -> String {
if str_eq(tool_name, "read_file") {
let path: String = json_get(tool_input, "path")
let root: String = agent_workspace_root()
if !path_within_root(path, root) {
return json_safe("denied: path is outside the agent workspace root")
}
let content: String = fs_read(resolve_in_root(path, root))
let content: String = fs_read(path)
return json_safe(content)
}
if str_eq(tool_name, "write_file") {
let path: String = json_get(tool_input, "path")
let content: String = json_get(tool_input, "content")
let root: String = agent_workspace_root()
if !path_within_root(path, root) {
return json_safe("denied: path is outside the agent workspace root")
}
fs_write(resolve_in_root(path, root), content)
fs_write(path, content)
return json_safe("{\"ok\":true}")
}
if str_eq(tool_name, "web_get") {
@@ -463,9 +404,7 @@ fn dispatch_tool(tool_name: String, tool_input: String) -> String {
}
if str_eq(tool_name, "run_command") {
let cmd: String = json_get(tool_input, "command")
let root: String = agent_workspace_root()
let scoped: String = if str_eq(root, "") { cmd } else { "cd " + root + " && ( " + cmd + " )" }
let result: String = exec_capture(scoped)
let result: String = exec_capture(cmd)
return json_safe(result)
}
// MCP connector tools (namespaced mcp__<server>__<tool>) are routed through
@@ -485,21 +424,13 @@ fn dispatch_tool(tool_name: String, tool_input: String) -> String {
}
if str_eq(tool_name, "list_files") {
let path: String = json_get(tool_input, "path")
let root: String = agent_workspace_root()
if !path_within_root(path, root) {
return json_safe("denied: path is outside the agent workspace root")
}
let result: String = exec_capture("ls -la " + resolve_in_root(path, root) + " 2>&1")
let result: String = exec_capture("ls -la " + path + " 2>&1")
return json_safe(result)
}
if str_eq(tool_name, "grep") {
let pattern: String = json_get(tool_input, "pattern")
let path: String = json_get(tool_input, "path")
let root: String = agent_workspace_root()
if !path_within_root(path, root) {
return json_safe("denied: path is outside the agent workspace root")
}
let result: String = exec_capture("grep -rn \"" + pattern + "\" " + resolve_in_root(path, root) + " 2>&1 | head -50")
let result: String = exec_capture("grep -rn \"" + pattern + "\" " + path + " 2>&1 | head -50")
return json_safe(result)
}
if str_eq(tool_name, "edit_file") {