Resolve conflicts with upstream main for timeline undo - #3

Resolve conflicts with upstream main for timeline undo#3

AryanNandanwar merged 17 commits into

agent-action-timeline-undoAryanNandanwar/nanocoder:agent-action-timeline-undofrom

cursor/resolve-main-conflicts-c7e1AryanNandanwar/nanocoder:cursor/resolve-main-conflicts-c7e1Copy head branch name to clipboard