@rethinkingstudio/clawpilot 2.1.21-beta.1 → 2.1.21-beta.10

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rethinkingstudio/clawpilot",
-  "version": "2.1.21-beta.1",
+  "version": "2.1.21-beta.10",
   "description": "ClawAI relay client for Mac mini",
   "type": "module",
   "bin": {

package/scripts/hermes_agent_bridge.py

@@ -87,30 +87,102 @@ def read_base_config_for_profile() -> Dict[str, Any]:
     return read_yaml_config(parent.parent / "config.yaml")
 
 
+def normalize_message_content(value: Any) -> Any:
+    if value is None:
+        return ""
+    if isinstance(value, str):
+        return value
+    if isinstance(value, list):
+        parts: List[Any] = []
+        for part in value:
+            if isinstance(part, str):
+                parts.append({"type": "text", "text": part})
+                continue
+            if not isinstance(part, dict):
+                continue
+            clean_part = {k: v for k, v in part.items() if v is not None}
+            if clean_part.get("type") == "text":
+                clean_part["text"] = str(clean_part.get("text") or "")
+            if clean_part:
+                parts.append(clean_part)
+        return parts if parts else ""
+    return str(value)
+
+
+def normalize_tool_calls(value: Any) -> List[Dict[str, Any]]:
+    if not isinstance(value, list):
+        return []
+    clean_calls: List[Dict[str, Any]] = []
+    for index, call in enumerate(value):
+        if not isinstance(call, dict):
+            continue
+        raw_function = call.get("function")
+        function = raw_function if isinstance(raw_function, dict) else {}
+        name = str(function.get("name") or call.get("name") or "").strip()
+        if not name:
+            continue
+        raw_arguments = function.get("arguments")
+        if raw_arguments is None:
+            arguments = "{}"
+        elif isinstance(raw_arguments, str):
+            arguments = raw_arguments
+        else:
+            try:
+                arguments = json.dumps(raw_arguments, ensure_ascii=False)
+            except Exception:
+                arguments = str(raw_arguments)
+        call_id = str(call.get("id") or call.get("call_id") or f"call_{index}").strip()
+        clean_calls.append(
+            {
+                "id": call_id,
+                "type": str(call.get("type") or "function"),
+                "function": {
+                    "name": name,
+                    "arguments": arguments,
+                },
+            }
+        )
+    return clean_calls
+
+
 def sanitize_messages_for_api(messages: List[Dict[str, Any]]) -> List[Dict[str, Any]]:
     valid_tool_call_ids: set[str] = set()
     for msg in messages:
         if not isinstance(msg, dict):
             continue
         if msg.get("role") == "assistant":
-            for tc in msg.get("tool_calls") or []:
-                if isinstance(tc, dict):
-                    tid = tc.get("id") or tc.get("call_id") or ""
-                    if tid:
-                        valid_tool_call_ids.add(str(tid))
+            for tc in normalize_tool_calls(msg.get("tool_calls")):
+                tid = tc.get("id") or ""
+                if tid:
+                    valid_tool_call_ids.add(str(tid))
 
     clean: List[Dict[str, Any]] = []
     for msg in messages:
         if not isinstance(msg, dict):
             continue
-        role = msg.get("role")
+        role = str(msg.get("role") or "").strip()
+        if role not in {"system", "user", "assistant", "tool"}:
+            continue
+        sanitized: Dict[str, Any] = {"role": role}
         if role == "tool":
             tid = str(msg.get("tool_call_id") or "")
             if not tid or tid not in valid_tool_call_ids:
                 continue
-        sanitized = {k: v for k, v in msg.items() if k in _API_SAFE_MSG_KEYS}
-        if sanitized.get("role"):
-            clean.append(sanitized)
+            sanitized["tool_call_id"] = tid
+            if msg.get("name"):
+                sanitized["name"] = str(msg.get("name"))
+
+        if role == "assistant":
+            tool_calls = normalize_tool_calls(msg.get("tool_calls"))
+            if tool_calls:
+                sanitized["tool_calls"] = tool_calls
+
+        content = normalize_message_content(msg.get("content"))
+        if content or role != "assistant" or sanitized.get("tool_calls"):
+            sanitized["content"] = content
+        if msg.get("refusal") is not None:
+            sanitized["refusal"] = str(msg.get("refusal"))
+        clean.append(sanitized)
     return clean
 
 
@@ -147,9 +219,10 @@ def read_session_history_from_json(session_id: Optional[str]) -> List[Dict[str,
 
 
 def read_session_history(session_id: Optional[str], session_db: Optional[SessionDB]) -> List[Dict[str, Any]]:
-    from_db = read_session_history_from_db(session_id, session_db)
-    if from_db:
-        return from_db
+    if os.environ.get("CLAWPILOT_HERMES_BRIDGE_DISABLE_SESSIONDB_HISTORY") != "1":
+        from_db = read_session_history_from_db(session_id, session_db)
+        if from_db:
+            return from_db
     return read_session_history_from_json(session_id)