Merge remote-tracking branch 'origin/main' into semantic-search-watch-worktrees