fix: remove built-in tools from LLM visibility and harden system prompt (#10)

Remove get_current_time and calculate from tool definitions exposed to the
LLM to prevent small models from proactively calling tools on greetings.
The tools remain callable in tool_engine but are no longer advertised.
Also fix stale +2 offset in get_filtered_definitions_json and strengthen
the system prompt to explicitly forbid tool calls for casual conversation.
Bump version to 0.3.1.

Author: shubhammalhotra28

CMakeLists.txt

@@ -5,7 +5,7 @@ if(POLICY CMP0177)
 endif()
 set(CMAKE_POLICY_VERSION_MINIMUM 3.5 CACHE STRING "" FORCE)
 
-project(rcli VERSION 0.3.0 LANGUAGES C CXX)
+project(rcli VERSION 0.3.1 LANGUAGES C CXX)
 
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)

src/actions/action_registry.cpp

@@ -28,11 +28,6 @@ std::string ActionRegistry::get_definitions_json() const {
     oss << "[\n";
     bool first = true;
 
-    // Built-in tools (time, calculate)
-    oss << "  {\"name\": \"get_current_time\", \"description\": \"Get the current date and time\", \"parameters\": {}}";
-    first = false;
-    oss << ",\n  {\"name\": \"calculate\", \"description\": \"Evaluate a math expression\", \"parameters\": {\"expression\": \"math expression like 2 + 2\"}}";
-
     for (auto& [name, entry] : actions_) {
         if (enabled_.count(name) == 0) continue;
         if (!first) oss << ",\n";
@@ -89,15 +84,6 @@ std::string ActionRegistry::get_filtered_definitions_json(
 
     std::vector<ScoredAction> scored;
 
-    // Score built-in tools the same way as macOS actions
-    scored.push_back({"get_current_time",
-                      "Get the current date and time", "{}",
-                      score_haystack("get_current_time get the current date and time")});
-    scored.push_back({"calculate",
-                      "Evaluate a math expression",
-                      "{\"expression\": \"math expression like 2 + 2\"}",
-                      score_haystack("calculate evaluate a math expression")});
-
     for (auto& [name, entry] : actions_) {
         if (enabled_.count(name) == 0) continue;
 
@@ -129,8 +115,7 @@ std::string ActionRegistry::get_filtered_definitions_json(
 
     if (!any_relevant) return "";
 
-    // Return full set: built-in tools are already in `scored`, plus
-    // top-k macOS actions (all of them if there are fewer than max_tools).
+    // Return top-k macOS actions (all of them if there are fewer than max_tools).
     std::ostringstream oss;
     oss << "[\n";
     int included = 0;
@@ -140,7 +125,7 @@ std::string ActionRegistry::get_filtered_definitions_json(
             << "\", \"description\": \"" << sa.description
             << "\", \"parameters\": " << sa.parameters_json << "}";
         included++;
-        if (included >= max_tools + 2) break; // +2 for built-in tools
+        if (included >= max_tools) break;
     }
     oss << "\n]";
     return oss.str();

src/core/constants.h

@@ -7,10 +7,10 @@ static constexpr const char* RCLI_SYSTEM_PROMPT =
     "You answer questions, explain topics, have conversations, and can also perform actions on the Mac.\n"
     "Your responses will be spoken aloud, so keep them natural and conversational.\n"
     "RULES:\n"
-    "1. For questions, explanations, chitchat, greetings, or anything conversational, "
-    "just answer directly. Do NOT mention tools. Do NOT say you lack a tool. Just answer the question.\n"
-    "2. Only use tools when the user asks you to DO something on the Mac "
-    "(open, create, play, send, search, set timer, etc.). Pick the most specific tool.\n"
+    "1. For greetings (hi, hello, hey), chitchat, questions, or explanations, "
+    "just respond naturally. NEVER call tools for greetings or casual conversation.\n"
+    "2. Only use tools when the user explicitly asks you to DO something on the Mac "
+    "(open, create, play, send, search, set volume, etc.). Pick the most specific tool.\n"
     "3. Never use asterisks, bullet points, numbered lists, markdown formatting, "
     "or any special symbols. Write in plain conversational sentences only.\n"
     "4. When you use a tool, output ONLY the tool call block with no other text.\n"

src/tools/tool_defs.h

@@ -4,9 +4,6 @@
 
 namespace rastack {
 
-static const char* DEFAULT_TOOL_DEFS_JSON = R"([
-  {"name": "get_current_time", "description": "Get the current date and time", "parameters": {}},
-  {"name": "calculate", "description": "Evaluate a math expression", "parameters": {"expression": "math expression like '2 + 2'"}}
-])";
+static const char* DEFAULT_TOOL_DEFS_JSON = R"([])";
 
 } // namespace rastack