More MCP work

tools/mcp-bridge.py

@@ -68,7 +68,7 @@ def disconnect():
 
 
 def send_and_receive(message):
-    """Send a JSON message to the editor and return the response."""
+    """Send a JSON message to the editor and return the null-terminated response."""
     data = json.dumps(message) + "\n"
     sock.sendall(data.encode())
 
@@ -78,10 +78,10 @@ def send_and_receive(message):
         if not chunk:
             raise ConnectionError("Connection closed")
         result += chunk
-        try:
-            return json.loads(result)
-        except json.JSONDecodeError:
-            continue
+        if b"\0" in result:
+            break
+
+    return result[:result.index(b"\0")].decode()
 
 
 def forward_to_editor(arguments):
@@ -128,10 +128,8 @@ def handle_message(msg):
         params = msg.get("params", {})
         arguments = params.get("arguments", {})
         result = forward_to_editor(arguments)
-        is_error = "error" in result
         return make_jsonrpc(msg_id, {
-            "content": [{"type": "text", "text": json.dumps(result)}],
-            **({"isError": True} if is_error else {}),
+            "content": [{"type": "text", "text": result}],
         })
 
     return {