rebase
Correct .ts definitions, support for Cursor