MCP: resolve merge conflicts; unify NL parsing and text-edit guards; add SHA precondition and immediate refresh; keep verification slice; minor test and uv.lock updates

Author: dsarno

UnityMcpBridge/UnityMcpServer~/src/server.py

@@ -147,7 +147,6 @@ def read_resource(ctx: Context, uri: str) -> dict:
             return {"mimeType": "text/plain", "text": text, "metadata": {"sha256": sha}}
         except Exception as e:
             return {"mimeType": "text/plain", "text": f"Error reading resource: {e}"}
-    
 
 # Run the server
 if __name__ == "__main__":

UnityMcpBridge/UnityMcpServer~/src/tools/manage_script_edits.py

@@ -229,6 +229,14 @@ def script_apply_edits(
                 e.setdefault("text", "")
                 normalized_edits.append(e)
                 continue
+            if op == "regex_replace" and ("replacement" not in e):
+                # Normalize alternative text fields into 'replacement' for local preview path
+                if "text" in e:
+                    e = dict(e)
+                    e["replacement"] = e.get("text", "")
+                elif "insert" in e or "content" in e:
+                    e = dict(e)
+                    e["replacement"] = e.get("insert") or e.get("content") or ""
             if op == "anchor_insert" and not (e.get("text") or e.get("insert") or e.get("content") or e.get("replacement")):
                 # Upgrade empty insert intent to anchor_delete with guidance
                 e = dict(e)
@@ -426,7 +434,6 @@ def line_col_from_index(idx: int) -> Tuple[int, int]:
                 return {"success": False, "message": "Preview diff; set options.confirm=true to apply.", "data": {"diff": "\n".join(diff)}}
             except Exception as e:
                 return {"success": False, "message": f"Preview failed: {e}"}
-
         # 2) apply edits locally (only if not text-ops)
         try:
             new_contents = _apply_edits_locally(contents, edits)

UnityMcpBridge/UnityMcpServer~/src/uv.lock

@@ -48,33 +48,17 @@ def visit_Call(self, node: ast.Call):
                 # print(...)
                 if isinstance(node.func, ast.Name) and node.func.id == "print":
                     self.hit = True
-                # builtins.print(...)
-                elif (
-                    isinstance(node.func, ast.Attribute)
-                    and node.func.attr == "print"
-                    and isinstance(node.func.value, ast.Name)
-                    and node.func.value.id == "builtins"
-                ):
-                    self.hit = True
                 # sys.stdout.write(...)
-                if (
-                    isinstance(node.func, ast.Attribute)
-                    and node.func.attr == "write"
-                    and isinstance(node.func.value, ast.Attribute)
-                    and node.func.value.attr == "stdout"
-                    and isinstance(node.func.value.value, ast.Name)
-                    and node.func.value.value.id == "sys"
-                ):
-                    self.hit = True
+                if isinstance(node.func, ast.Attribute) and node.func.attr == "write":
+                    val = node.func.value
+                    if isinstance(val, ast.Attribute) and val.attr == "stdout":
+                        if isinstance(val.value, ast.Name) and val.value.id == "sys":
+                            self.hit = True
                 self.generic_visit(node)
 
         v = StdoutVisitor()
         v.visit(tree)
         if v.hit:
             offenders.append(py_file.relative_to(SRC))
-<<<<<<< HEAD
-=======
-
     assert not syntax_errors, "syntax errors in: " + ", ".join(str(e) for e in syntax_errors)
->>>>>>> 1a50016 (clarify stdout test failure messaging)
     assert not offenders, "stdout writes found in: " + ", ".join(str(o) for o in offenders)