Skip to content

fix(server): a tool call with a parameter named -i is no longer dropped #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
davide221 merged 1 commit into from
Oct 11, 2026
Merged

fix(server): a tool call with a parameter named -i is no longer dropped #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 12 additions & 9 deletions server/src/server/tool_parser.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,14 +67,17 @@ static const char TOOL_CODE_OPEN[] = "<tool_code>";
static const char ATTRIBUTE_PARAMETER_OPEN[] = "<parameter name=";
static const char ARG_KEY_OPEN[] = "<arg_key>";

// Parameter names may start with '-': Claude Code's Grep takes -i, -n, -A, -B
// and -C, and a call whose names no pattern matches is dropped whole.
//
// Where an unclosed attribute-style parameter value ends: at a line break that
// is followed by a complete sibling open tag carrying only name/string
// attributes. Anything looser fires on literal tag text inside verbatim values
// (echo '<param>', or XML content such as <param name="x" value="y"/>).
#define SIBLING_PARAM_BOUNDARY \
R"(\n(?=\s*<(?:｜DSML｜)?(?:param|parameter)\s+)" \
R"((?:name\s*=\s*["']?[A-Za-z_][\w.\-]*["']?(?:\s+string\s*=\s*["']?[^\s"'>]+["']?)?)" \
R"(|string\s*=\s*["']?[^\s"'>]+["']?\s+name\s*=\s*["']?[A-Za-z_][\w.\-]*["']?)\s*>))"
R"((?:name\s*=\s*["']?-?[A-Za-z_][\w.\-]*["']?(?:\s+string\s*=\s*["']?[^\s"'>]+["']?)?)" \
R"(|string\s*=\s*["']?[^\s"'>]+["']?\s+name\s*=\s*["']?-?[A-Za-z_][\w.\-]*["']?)\s*>))"



Expand Down Expand Up @@ -356,13 +359,13 @@ static const std::regex & re_bare_tool_name_xml() {

static const std::regex & re_attribute_tool_xml() {
static std::regex r(
R"re(<parameter\s+name\s*=\s*"([A-Za-z_][\w.\-]*)"\s*>([\s\S]*?)</function>)re");
R"re(<parameter\s+name\s*=\s*"(-?[A-Za-z_][\w.\-]*)"\s*>([\s\S]*?)</function>)re");
return r;
}

static const std::regex & re_attribute_parameter_xml() {
static std::regex r(
R"re(<parameter\s+name\s*=\s*"([A-Za-z_][\w.\-]*)"\s*>([\s\S]*?)</parameter>)re");
R"re(<parameter\s+name\s*=\s*"(-?[A-Za-z_][\w.\-]*)"\s*>([\s\S]*?)</parameter>)re");
return r;
}

Expand All @@ -380,7 +383,7 @@ static const std::regex & re_space_function_xml() {

static const std::regex & re_complete_parameter_xml() {
static std::regex r(
R"(<parameter=([A-Za-z_][\w.\-]*)>([\s\S]*?)</parameter>)");
R"(<parameter=(-?[A-Za-z_][\w.\-]*)>([\s\S]*?)</parameter>)");
return r;
}

Expand Down Expand Up @@ -731,8 +734,8 @@ static bool parse_xml_tool_call_body(const std::string & body, const json & tool
// 3. Extract parameter key-value pairs:
// a. Attribute style: <(param|parameter) name="key" string="true|false">value</...> or <parameter=key>value</parameter>
static const std::regex re_attr_param(
R"(<(?:｜DSML｜)?(?:param|parameter)\s+(?:name\s*=\s*["']?([A-Za-z_][\w.\-]*)["']?\s+string\s*=\s*["']?true["']?|string\s*=\s*["']?true["']?\s+name\s*=\s*["']?([A-Za-z_][\w.\-]*)["']?)\s*>([\s\S]*?)(?:</(?:｜DSML｜)?(?:param|parameter)\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S])))"
R"(|<(?:｜DSML｜)?(?:param|parameter)\s+name\s*=\s*["']?([A-Za-z_][\w.\-]*)["']?(?:\s+string\s*=\s*["']?([^\s"'>]+)["']?)?\s*>([\s\S]*?)(?:</(?:｜DSML｜)?(?:param|parameter)\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S]))|<parameter=([A-Za-z_][\w.\-]*)>([\s\S]*?)</parameter>)");
R"(<(?:｜DSML｜)?(?:param|parameter)\s+(?:name\s*=\s*["']?(-?[A-Za-z_][\w.\-]*)["']?\s+string\s*=\s*["']?true["']?|string\s*=\s*["']?true["']?\s+name\s*=\s*["']?(-?[A-Za-z_][\w.\-]*)["']?)\s*>([\s\S]*?)(?:</(?:｜DSML｜)?(?:param|parameter)\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S])))"
R"(|<(?:｜DSML｜)?(?:param|parameter)\s+name\s*=\s*["']?(-?[A-Za-z_][\w.\-]*)["']?(?:\s+string\s*=\s*["']?([^\s"'>]+)["']?)?\s*>([\s\S]*?)(?:</(?:｜DSML｜)?(?:param|parameter)\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S]))|<parameter=(-?[A-Za-z_][\w.\-]*)>([\s\S]*?)</parameter>)");
auto pbegin = std::sregex_iterator(trimmed_params.begin(), trimmed_params.end(), re_attr_param);
auto pend = std::sregex_iterator();
if (pbegin != pend) {
Expand Down Expand Up @@ -1562,8 +1565,8 @@ ToolParseResult parse_tool_calls(const std::string & raw_text, const json & tool
R"(([\s\S]*?))"
R"((?:</(?:｜DSML｜)?invoke\s*>(?=\s*(?:<(?:｜DSML｜)?invoke[\s/>]|</(?:｜DSML｜)?(?:function_calls|tool_calls)\s*>|\{|(?![\s\S])))|(?=<(?:｜DSML｜)?invoke[\s/>])|(?=</(?:｜DSML｜)?(?:function_calls|tool_calls)\s*>)|(?![\s\S])))");
static const std::regex re_param(
R"(<(?:｜DSML｜)?(param|parameter)\s+(?:name\s*=\s*["']?([A-Za-z_][\w.\-]*)["']?\s+string\s*=\s*["']?true["']?|string\s*=\s*["']?true["']?\s+name\s*=\s*["']?([A-Za-z_][\w.\-]*)["']?)\s*>([\s\S]*?)(?:</(?:｜DSML｜)?\1\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S])))"
R"(|<(?:｜DSML｜)?(param|parameter)\s+name\s*=\s*["']?([A-Za-z_][\w.\-]*)["']?(?:\s+string\s*=\s*["']?([^\s"'>]+)["']?)?\s*>([\s\S]*?)(?:</(?:｜DSML｜)?\5\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S])))");
R"(<(?:｜DSML｜)?(param|parameter)\s+(?:name\s*=\s*["']?(-?[A-Za-z_][\w.\-]*)["']?\s+string\s*=\s*["']?true["']?|string\s*=\s*["']?true["']?\s+name\s*=\s*["']?(-?[A-Za-z_][\w.\-]*)["']?)\s*>([\s\S]*?)(?:</(?:｜DSML｜)?\1\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S])))"
R"(|<(?:｜DSML｜)?(param|parameter)\s+name\s*=\s*["']?(-?[A-Za-z_][\w.\-]*)["']?(?:\s+string\s*=\s*["']?([^\s"'>]+)["']?)?\s*>([\s\S]*?)(?:</(?:｜DSML｜)?\5\s*>|)" SIBLING_PARAM_BOUNDARY R"(|(?![\s\S])))");

auto fbegin = std::sregex_iterator(text.begin(), text.end(), re_block);
auto fend = std::sregex_iterator();
Expand Down
38 changes: 38 additions & 0 deletions server/test/unit/test_server_unit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1574,6 +1574,44 @@ TEST_CASE(ServerUnitFixture, test_parse_dsml_tool_calls_multiple_parameters) {
TEST_ASSERT(result.cleaned_text.empty());
}

TEST_CASE(ServerUnitFixture, test_parse_dsml_tool_calls_dash_parameter_names) {
// DeepSeek V4.1 calling Claude Code's Grep, whose flags are named -i and -n.
const std::string text =
"I'll explore the repository.\n\n"
"<｜DSML｜tool_calls>\n\n"
"<｜DSML｜invoke name=\"Grep\">\n"
"<｜DSML｜parameter name=\"pattern\" string=\"true\">prefix.?cache|PrefixCache</｜DSML｜parameter>\n"
"<｜DSML｜parameter name=\"output_mode\" string=\"true\">files_with_matches</｜DSML｜parameter>\n"
"<｜DSML｜parameter name=\"-i\" string=\"false\">true</｜DSML｜parameter>\n"
"<｜DSML｜parameter name=\"-n\" string=\"false\">true</｜DSML｜parameter>\n"
"</｜DSML｜invoke>\n"
"</｜DSML｜tool_calls>";
json tools = json::array({
{{"type", "function"}, {"function", {
{"name", "Grep"},
{"parameters", {
{"type", "object"},
{"properties", {
{"pattern", {{"type", "string"}}},
{"output_mode", {{"type", "string"}}},
{"-i", {{"type", "boolean"}}},
{"-n", {{"type", "boolean"}}}
}}
}}
}}}
});
auto result = parse_tool_calls(text, tools);
TEST_ASSERT(result.tool_calls.size() == 1);
if (!result.tool_calls.empty()) {
TEST_ASSERT(result.tool_calls[0].name == "Grep");
auto args = json::parse(result.tool_calls[0].arguments);
TEST_ASSERT(args["pattern"] == "prefix.?cache|PrefixCache");
TEST_ASSERT(args["-i"] == true);
TEST_ASSERT(args["-n"] == true);
}
TEST_ASSERT(result.cleaned_text == "I'll explore the repository.");
}

TEST_CASE(ServerUnitFixture, test_parse_dsml_tool_calls_edit_tool) {
const std::string text =
"<｜DSML｜tool_calls>\n"
Expand Down
Loading