don't process tool call if not enabled

Author: aldehir

common/chat.cpp

@@ -1364,7 +1364,7 @@ static void common_chat_parse_gpt_oss(common_chat_msg_parser & builder) {
     );
     static const common_regex builtin_tool_call_regex("(?:browser|python)[\\s\\S]*<\\|message\\|>");
 
-    auto consume_until_start = [&]() {
+    auto consume_until_next = [&]() {
         if (auto res = builder.try_find_regex(start_regex, std::string::npos, false)) {
             auto begin = res->groups[0].begin;
             builder.move_to(begin);
@@ -1382,27 +1382,31 @@ static void common_chat_parse_gpt_oss(common_chat_msg_parser & builder) {
             builder.consume_rest();
             LOG_ERR("builtin tool calls not implemented\n");
         } else {
-            throw common_chat_msg_parse_exception("expected function call, got: " + consume_until_start());
+            throw common_chat_msg_parse_exception("expected function call, got: " + consume_until_next());
         }
     };
 
     auto commentary = [&]() {
         if (builder.try_consume_regex(to_regex)) {
-            tool_call();
+            if (builder.syntax().parse_tool_calls) {
+                tool_call();
+            } else {
+                consume_until_next();
+            }
         } else if (builder.try_consume_regex(message_regex)) {
             if (!builder.try_find_regex(end_regex)) {
                 builder.add_content(builder.consume_rest());
             }
         } else {
-            throw common_chat_msg_parse_exception("expected: \" to=\" or <|message|>, got: " + consume_until_start());
+            throw common_chat_msg_parse_exception("expected: \" to=\" or <|message|>, got: " + consume_until_next());
         }
     };
 
     auto final = [&]() {
         if (builder.try_consume_regex(message_regex)) {
             builder.add_content(builder.consume_rest());
         } else {
-            throw common_chat_msg_parse_exception("expected: <|message|>, got: " + consume_until_start());
+            throw common_chat_msg_parse_exception("expected: <|message|>, got: " + consume_until_next());
         }
     };
 
@@ -1416,7 +1420,7 @@ static void common_chat_parse_gpt_oss(common_chat_msg_parser & builder) {
                 builder.add_reasoning_content(builder.consume_rest());
             }
         } else {
-            throw common_chat_msg_parse_exception("expected: <|message|>, got: " + consume_until_start());
+            throw common_chat_msg_parse_exception("expected: <|message|>, got: " + consume_until_next());
         }
     };
 
@@ -1433,15 +1437,15 @@ static void common_chat_parse_gpt_oss(common_chat_msg_parser & builder) {
                 }
             }
         } else {
-            throw common_chat_msg_parse_exception("expected: <|channel|>, got: " + consume_until_start());
+            throw common_chat_msg_parse_exception("expected: <|channel|>, got: " + consume_until_next());
         }
     };
 
     auto start = [&]() {
         if (builder.try_consume_regex(assistant_regex)) {
             channel();
         } else {
-            throw common_chat_msg_parse_exception("expected: <|assistant|>, got: " + consume_until_start());
+            throw common_chat_msg_parse_exception("expected: <|assistant|>, got: " + consume_until_next());
         }
     };