From 4bc721c3bf7589b519c5730d093f704ce56e3f09 Mon Sep 17 00:00:00 2001
From: tanaka takashi <isazaka@gmail.com>
Date: Mon, 29 Jun 2026 21:43:54 +0900
Subject: refactor: MCP層をmcpc APIベースに刷新
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 独自JSON-RPC処理をmcpcへ置き換え
- 各MCPツールを個別ソースへ分離
- 共通コンテキストと登録処理を整理
- mcpc互換修正と統合テストを更新
---
 src/mcp/tools/common/common.c | 117 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 117 insertions(+)
 create mode 100644 src/mcp/tools/common/common.c

(limited to 'src/mcp/tools/common/common.c')

diff --git a/src/mcp/tools/common/common.c b/src/mcp/tools/common/common.c
new file mode 100644
index 0000000..71b6f68
--- /dev/null
+++ b/src/mcp/tools/common/common.c
@@ -0,0 +1,117 @@
+#include "mcp/tools/common/common.h"
+
+#include <stdlib.h>
+
+#include "base/allocator.h"
+
+void
+tiny_mcp_tool_add_error(mcpc_ucbr_t *result, const char *code, const char *message)
+{
+  tiny_json_buffer_t json;
+  tiny_json_init(&json);
+  tiny_json_raw(&json, "{\"status\":\"ERROR\",\"error\":{\"code\":");
+  tiny_json_string(&json, code);
+  tiny_json_raw(&json, ",\"message\":");
+  tiny_json_string(&json, message);
+  tiny_json_raw(&json, "}}");
+  mcpc_toolcall_result_add_errmsg_printf8(
+      result, (const char8_t *)"%s", json.data ? json.data : "{}");
+  tiny_json_free(&json);
+}
+
+void
+tiny_mcp_tool_add_json(mcpc_ucbr_t *result, tiny_json_buffer_t *json)
+{
+  if (json->failed)
+    {
+      tiny_mcp_tool_add_error(result, "INTERNAL_ERROR", "response allocation failed");
+      return;
+    }
+  mcpc_toolcall_result_add_text_printf8(
+      result, (const char8_t *)"%s", json->data ? json->data : "{}");
+}
+
+char *
+tiny_mcp_tool_get_string(const mcpc_tool_t *tool, const char *name, size_t maximum)
+{
+  char *value = malloc(maximum + 1);
+  size_t length = 0;
+  if (!value
+      || mcpc_tool_get_tpropval_u8str(
+             tool, (const char8_t *)name, (char8_t *)value, maximum + 1, &length)
+             != MCPC_EC_0
+      || length > maximum)
+    {
+      free(value);
+      return NULL;
+    }
+  value[length] = '\0';
+  if (!tiny_utf8_valid(value, length))
+    {
+      free(value);
+      return NULL;
+    }
+  return value;
+}
+
+void
+tiny_mcp_tool_append_message(tiny_json_buffer_t *json, const tiny_message_t *message)
+{
+  size_t index;
+  tiny_json_raw(json, "{\"message_id\":");
+  tiny_json_string(json, message->message_id);
+  tiny_json_raw(json, ",\"session_id\":");
+  tiny_json_string(json, message->session_id);
+  tiny_json_raw(json, ",\"timestamp\":");
+  tiny_json_i64(json, message->timestamp_ms);
+  tiny_json_raw(json, ",\"role\":");
+  tiny_json_string(json, tiny_role_name(message->role));
+  tiny_json_raw(json, ",\"content\":");
+  tiny_json_string(json, message->content);
+  tiny_json_raw(json, ",\"metadata\":{");
+  if (message->metadata.tool_call_id)
+    {
+      tiny_json_raw(json, "\"tool_call_id\":");
+      tiny_json_string(json, message->metadata.tool_call_id);
+      tiny_json_raw(json, ",");
+    }
+  tiny_json_raw(json, "\"tags\":[");
+  for (index = 0; index < message->metadata.tag_count; ++index)
+    {
+      if (index)
+        {
+          tiny_json_raw(json, ",");
+        }
+      tiny_json_string(json, message->metadata.tags[index]);
+    }
+  tiny_json_raw(json, "],\"memory_tier\":");
+  tiny_json_string(json, tiny_tier_name(message->metadata.memory_tier));
+  tiny_json_raw(json, "}}");
+}
+
+mcpc_tool_t *
+tiny_mcp_tool_new(const char *name, const char *description, mcpc_tcallcb_t callback)
+{
+  mcpc_tool_t *tool = mcpc_tool_new2((const char8_t *)name, (const char8_t *)description);
+  if (!tool || mcpc_tool_set_call_cb(tool, callback) != MCPC_EC_0)
+    {
+      return NULL;
+    }
+  return tool;
+}
+
+bool
+tiny_mcp_tool_add_property(mcpc_tool_t *tool,
+                           const char *name,
+                           const char *description,
+                           mcpc_anytype_t type)
+{
+  mcpc_toolprop_t *property
+      = mcpc_toolprop_new2((const char8_t *)name, (const char8_t *)description, type);
+  if (!property)
+    {
+      return false;
+    }
+  mcpc_tool_add_toolprop(tool, property);
+  return true;
+}
-- 
cgit v1.2.3